diff options
| author | Ryan Cao <70191398+ryanccn@users.noreply.github.com> | 2022-05-28 21:15:00 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-28 21:15:00 +0800 |
| commit | 2be8100e7cb625f3e6356a68f20291c5aa327c02 (patch) | |
| tree | eaf364705154e0457a1bde40dff8b2c8d843c8e5 /launcher/meta/BaseEntity.cpp | |
| parent | 6d0ea13f97570f837f11022e3ef0fbfb6d0482f5 (diff) | |
| parent | 3ff26d5cfe293c635655d35e96d093ef0b383dc2 (diff) | |
| download | PrismLauncher-2be8100e7cb625f3e6356a68f20291c5aa327c02.tar.gz PrismLauncher-2be8100e7cb625f3e6356a68f20291c5aa327c02.tar.bz2 PrismLauncher-2be8100e7cb625f3e6356a68f20291c5aa327c02.zip | |
Merge branch 'develop' into global-jvm-args
Diffstat (limited to 'launcher/meta/BaseEntity.cpp')
| -rw-r--r-- | launcher/meta/BaseEntity.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/launcher/meta/BaseEntity.cpp b/launcher/meta/BaseEntity.cpp index 84155922..de4e1012 100644 --- a/launcher/meta/BaseEntity.cpp +++ b/launcher/meta/BaseEntity.cpp @@ -75,7 +75,16 @@ Meta::BaseEntity::~BaseEntity() QUrl Meta::BaseEntity::url() const { - return QUrl(BuildConfig.META_URL).resolved(localFilename()); + auto s = APPLICATION->settings(); + QString metaOverride = s->get("MetaURLOverride").toString(); + if(metaOverride.isEmpty()) + { + return QUrl(BuildConfig.META_URL).resolved(localFilename()); + } + else + { + return QUrl(metaOverride).resolved(localFilename()); + } } bool Meta::BaseEntity::loadLocalFile() |