aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft/mod/TexturePackFolderModel.cpp
diff options
context:
space:
mode:
authorTrial97 <alexandru.tripon97@gmail.com>2023-05-28 18:01:39 +0300
committerTrial97 <alexandru.tripon97@gmail.com>2023-05-28 18:01:39 +0300
commit737fc1a2a43ba68a640521f187424d0de800ddee (patch)
treedac1a30688941e84e000a89ae1144bd5f567ad9f /launcher/minecraft/mod/TexturePackFolderModel.cpp
parent2f37cb31d990ec26e07760925b0943388d36c7e5 (diff)
parentbdff8591aa945bd193f0fdae613f14dea6fb4809 (diff)
downloadPrismLauncher-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/TexturePackFolderModel.cpp')
-rw-r--r--launcher/minecraft/mod/TexturePackFolderModel.cpp2
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)
{}