diff options
| author | Trial97 <alexandru.tripon97@gmail.com> | 2023-06-18 23:27:41 +0300 |
|---|---|---|
| committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-06-18 23:27:41 +0300 |
| commit | 6826f1d6051653bce8f670474d539a348b20e6d9 (patch) | |
| tree | 824350062460ef21b223105c50165e6df7983954 /launcher/ui/pages/modplatform/flame | |
| parent | 0161520b332f485483f57acc305ad71a00d63fbc (diff) | |
| parent | 12cd8a7bea991c2a8d4b59b1cfc9f7c246819fc9 (diff) | |
| download | PrismLauncher-6826f1d6051653bce8f670474d539a348b20e6d9.tar.gz PrismLauncher-6826f1d6051653bce8f670474d539a348b20e6d9.tar.bz2 PrismLauncher-6826f1d6051653bce8f670474d539a348b20e6d9.zip | |
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into net_job_crash
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 54d0b003..fa55aa68 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 e3d0bc14..667a52d0 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 0252ac40..221c8f7a 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: |