aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft/mod/TexturePackFolderModel.h
diff options
context:
space:
mode:
authorTrial97 <alexandru.tripon97@gmail.com>2023-05-28 17:44:23 +0300
committerTrial97 <alexandru.tripon97@gmail.com>2023-05-28 17:44:23 +0300
commit27c3775f99fd5b6fed08f316b304add8c9d1b106 (patch)
tree0406cfc149297f1c882cd8bf5d7e3d40246577ce /launcher/minecraft/mod/TexturePackFolderModel.h
parentbf0a577fb9d063d90d0003227fce08f32fa09dd1 (diff)
parent954d4d701a136e79c25b58f9680d26a555a6e6fe (diff)
downloadPrismLauncher-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.h')
-rw-r--r--launcher/minecraft/mod/TexturePackFolderModel.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/launcher/minecraft/mod/TexturePackFolderModel.h b/launcher/minecraft/mod/TexturePackFolderModel.h
index 246997bd..425a71e4 100644
--- a/launcher/minecraft/mod/TexturePackFolderModel.h
+++ b/launcher/minecraft/mod/TexturePackFolderModel.h
@@ -43,7 +43,7 @@ class TexturePackFolderModel : public ResourceFolderModel
Q_OBJECT
public:
- explicit TexturePackFolderModel(const QString &dir, std::shared_ptr<const BaseInstance> instance);
+ explicit TexturePackFolderModel(const QString &dir, BaseInstance* instance);
[[nodiscard]] Task* createUpdateTask() override;
[[nodiscard]] Task* createParseTask(Resource&) override;
};