diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-10-18 01:00:46 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-10-18 01:00:46 +0200 |
| commit | 205570be32b5cbd40eeb2b7e2d8d4fe116b07f64 (patch) | |
| tree | 7af19a7479ae0c1dbef4d9cbc65c5550f9a3adc1 /logic/OneSixVersion.cpp | |
| parent | a600286e33601a85949b9e51bd5421a45f9998ac (diff) | |
| download | MultiMC-205570be32b5cbd40eeb2b7e2d8d4fe116b07f64.tar MultiMC-205570be32b5cbd40eeb2b7e2d8d4fe116b07f64.tar.gz MultiMC-205570be32b5cbd40eeb2b7e2d8d4fe116b07f64.tar.lz MultiMC-205570be32b5cbd40eeb2b7e2d8d4fe116b07f64.tar.xz MultiMC-205570be32b5cbd40eeb2b7e2d8d4fe116b07f64.zip | |
Support version format 9, fix version-related segfault, (maybe) fix forge lists.
Diffstat (limited to 'logic/OneSixVersion.cpp')
| -rw-r--r-- | logic/OneSixVersion.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/logic/OneSixVersion.cpp b/logic/OneSixVersion.cpp index f7efedf9..51958389 100644 --- a/logic/OneSixVersion.cpp +++ b/logic/OneSixVersion.cpp @@ -136,7 +136,7 @@ std::shared_ptr<OneSixVersion> OneSixVersion::fromJson(QJsonObject root) root.value("minimumLauncherVersion").toDouble(); // ADD MORE HERE :D - if (launcher_ver > 0 && launcher_ver <= 7) + if (launcher_ver > 0 && launcher_ver <= 9) return fromJsonV4(root, readVersion); else { @@ -167,7 +167,8 @@ std::shared_ptr<OneSixVersion> OneSixVersion::fromFile(QString filepath) } QJsonObject root = jsonDoc.object(); auto version = fromJson(root); - version->original_file = filepath; + if(version) + version->original_file = filepath; return version; } |