diff options
| author | Trial97 <alexandru.tripon97@gmail.com> | 2023-05-28 17:44:23 +0300 |
|---|---|---|
| committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-05-28 17:44:23 +0300 |
| commit | 27c3775f99fd5b6fed08f316b304add8c9d1b106 (patch) | |
| tree | 0406cfc149297f1c882cd8bf5d7e3d40246577ce /launcher/minecraft/mod/TexturePackFolderModel.cpp | |
| parent | bf0a577fb9d063d90d0003227fce08f32fa09dd1 (diff) | |
| parent | 954d4d701a136e79c25b58f9680d26a555a6e6fe (diff) | |
| download | PrismLauncher-27c3775f99fd5b6fed08f316b304add8c9d1b106.tar.gz PrismLauncher-27c3775f99fd5b6fed08f316b304add8c9d1b106.tar.bz2 PrismLauncher-27c3775f99fd5b6fed08f316b304add8c9d1b106.zip | |
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into Fix_Assert
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
Diffstat (limited to 'launcher/minecraft/mod/TexturePackFolderModel.cpp')
| -rw-r--r-- | launcher/minecraft/mod/TexturePackFolderModel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/launcher/minecraft/mod/TexturePackFolderModel.cpp b/launcher/minecraft/mod/TexturePackFolderModel.cpp index 1e218537..c6609ed1 100644 --- a/launcher/minecraft/mod/TexturePackFolderModel.cpp +++ b/launcher/minecraft/mod/TexturePackFolderModel.cpp @@ -39,7 +39,7 @@ #include "minecraft/mod/tasks/BasicFolderLoadTask.h" #include "minecraft/mod/tasks/LocalTexturePackParseTask.h" -TexturePackFolderModel::TexturePackFolderModel(const QString& dir, std::shared_ptr<const BaseInstance> instance) +TexturePackFolderModel::TexturePackFolderModel(const QString& dir, BaseInstance* instance) : ResourceFolderModel(QDir(dir), instance) {} |