diff options
author | Trial97 <alexandru.tripon97@gmail.com> | 2023-06-19 00:06:44 +0300 |
---|---|---|
committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-06-19 00:06:44 +0300 |
commit | 319ce8c19f801a4bec920c6778cf140e9f92ee32 (patch) | |
tree | 6322b81bf4146ba98b5894ebbb8201a37cc8c044 /launcher/ui/pages/modplatform/flame | |
parent | 182e19eae3e2aa9f50dde140d10db858b5bf6076 (diff) | |
parent | 12cd8a7bea991c2a8d4b59b1cfc9f7c246819fc9 (diff) | |
download | PrismLauncher-319ce8c19f801a4bec920c6778cf140e9f92ee32.tar.gz PrismLauncher-319ce8c19f801a4bec920c6778cf140e9f92ee32.tar.bz2 PrismLauncher-319ce8c19f801a4bec920c6778cf140e9f92ee32.zip |
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
Diffstat (limited to 'launcher/ui/pages/modplatform/flame')
3 files changed, 4 insertions, 2 deletions
diff --git a/launcher/ui/pages/modplatform/flame/FlameModel.cpp b/launcher/ui/pages/modplatform/flame/FlameModel.cpp index 5961ea02..d9d5ef5b 100644 --- a/launcher/ui/pages/modplatform/flame/FlameModel.cpp +++ b/launcher/ui/pages/modplatform/flame/FlameModel.cpp @@ -60,6 +60,8 @@ QVariant ListModel::data(const QModelIndex& index, int role) const return pack.description; case UserDataTypes::SELECTED: return false; + case UserDataTypes::INSTALLED: + return false; default: break; } diff --git a/launcher/ui/pages/modplatform/flame/FlameResourceModels.cpp b/launcher/ui/pages/modplatform/flame/FlameResourceModels.cpp index b233a845..0fb67c50 100644 --- a/launcher/ui/pages/modplatform/flame/FlameResourceModels.cpp +++ b/launcher/ui/pages/modplatform/flame/FlameResourceModels.cpp @@ -11,7 +11,7 @@ namespace ResourceDownload { -FlameModModel::FlameModModel(BaseInstance const& base) : ModModel(base, new FlameAPI) {} +FlameModModel::FlameModModel(BaseInstance& base) : ModModel(base, new FlameAPI) {} void FlameModModel::loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj) { diff --git a/launcher/ui/pages/modplatform/flame/FlameResourceModels.h b/launcher/ui/pages/modplatform/flame/FlameResourceModels.h index f3ef918a..6cfd6a6f 100644 --- a/launcher/ui/pages/modplatform/flame/FlameResourceModels.h +++ b/launcher/ui/pages/modplatform/flame/FlameResourceModels.h @@ -14,7 +14,7 @@ class FlameModModel : public ModModel { Q_OBJECT public: - FlameModModel(const BaseInstance&); + FlameModModel(BaseInstance&); ~FlameModModel() override = default; private: |