diff options
| author | Trial97 <alexandru.tripon97@gmail.com> | 2023-05-28 18:01:39 +0300 |
|---|---|---|
| committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-05-28 18:01:39 +0300 |
| commit | 737fc1a2a43ba68a640521f187424d0de800ddee (patch) | |
| tree | dac1a30688941e84e000a89ae1144bd5f567ad9f /launcher/minecraft/mod/ResourcePackFolderModel.cpp | |
| parent | 2f37cb31d990ec26e07760925b0943388d36c7e5 (diff) | |
| parent | bdff8591aa945bd193f0fdae613f14dea6fb4809 (diff) | |
| download | PrismLauncher-737fc1a2a43ba68a640521f187424d0de800ddee.tar.gz PrismLauncher-737fc1a2a43ba68a640521f187424d0de800ddee.tar.bz2 PrismLauncher-737fc1a2a43ba68a640521f187424d0de800ddee.zip | |
Merge branch 'Fix_Assert' of github.com:Trial97/PrismLauncher into develop
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
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 6eba4e2e..c12d1f23 100644 --- a/launcher/minecraft/mod/ResourcePackFolderModel.cpp +++ b/launcher/minecraft/mod/ResourcePackFolderModel.cpp @@ -45,7 +45,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::PACK_FORMAT, SortType::DATE }; |