diff options
| author | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-05-28 12:01:49 -0700 |
|---|---|---|
| committer | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-05-28 12:01:49 -0700 |
| commit | b28f682ad9726c536f49579a3bd810cacc6e45ef (patch) | |
| tree | 01d826f424072c8d9b78e9b6c6289ec3200bf092 /launcher/minecraft/mod/ResourcePackFolderModel.cpp | |
| parent | 086a7e19f099c6c9b9529afb2360300e534876bf (diff) | |
| parent | 954d4d701a136e79c25b58f9680d26a555a6e6fe (diff) | |
| download | PrismLauncher-b28f682ad9726c536f49579a3bd810cacc6e45ef.tar.gz PrismLauncher-b28f682ad9726c536f49579a3bd810cacc6e45ef.tar.bz2 PrismLauncher-b28f682ad9726c536f49579a3bd810cacc6e45ef.zip | |
Merge branch 'develop' into feature/images-for-resource-page
Diffstat (limited to 'launcher/minecraft/mod/ResourcePackFolderModel.cpp')
| -rw-r--r-- | launcher/minecraft/mod/ResourcePackFolderModel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/launcher/minecraft/mod/ResourcePackFolderModel.cpp b/launcher/minecraft/mod/ResourcePackFolderModel.cpp index 7ec5668c..8a7b1049 100644 --- a/launcher/minecraft/mod/ResourcePackFolderModel.cpp +++ b/launcher/minecraft/mod/ResourcePackFolderModel.cpp @@ -47,7 +47,7 @@ #include "minecraft/mod/tasks/BasicFolderLoadTask.h" #include "minecraft/mod/tasks/LocalResourcePackParseTask.h" -ResourcePackFolderModel::ResourcePackFolderModel(const QString& dir, std::shared_ptr<const BaseInstance> instance) +ResourcePackFolderModel::ResourcePackFolderModel(const QString& dir, BaseInstance* instance) : ResourceFolderModel(QDir(dir), instance) { m_column_sort_keys = { SortType::ENABLED, SortType::NAME, SortType::NAME, SortType::PACK_FORMAT, SortType::DATE}; |