diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-03-03 09:08:32 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-03-03 09:08:32 +0100 |
| commit | 011ea8453015ff4d8fd1f9bed5bed36959c20269 (patch) | |
| tree | 749bc193f582b44ad7f45653f77e5b038a7a21cc /logic | |
| parent | d66f2500a6b4215a135f1e41802f7c7498375c62 (diff) | |
| download | MultiMC-011ea8453015ff4d8fd1f9bed5bed36959c20269.tar MultiMC-011ea8453015ff4d8fd1f9bed5bed36959c20269.tar.gz MultiMC-011ea8453015ff4d8fd1f9bed5bed36959c20269.tar.lz MultiMC-011ea8453015ff4d8fd1f9bed5bed36959c20269.tar.xz MultiMC-011ea8453015ff4d8fd1f9bed5bed36959c20269.zip | |
Fix missed version file assignment.
Diffstat (limited to 'logic')
| -rw-r--r-- | logic/OneSixVersionBuilder.cpp | 5 | ||||
| -rw-r--r-- | logic/VersionFile.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/logic/OneSixVersionBuilder.cpp b/logic/OneSixVersionBuilder.cpp index 879ff72e..0c63dc2a 100644 --- a/logic/OneSixVersionBuilder.cpp +++ b/logic/OneSixVersionBuilder.cpp @@ -90,8 +90,7 @@ void OneSixVersionBuilder::buildInternal(const bool onlyVanilla, const QStringLi { // version.json QLOG_INFO() << "Reading version.json"; - VersionFile file; - parseJsonFile(QFileInfo(root.absoluteFilePath("version.json")), false, &file); + VersionFile file = parseJsonFile(QFileInfo(root.absoluteFilePath("version.json")), false); file.name = "Minecraft"; file.fileId = "org.multimc.version.json"; file.version = m_instance->intendedVersionId(); @@ -124,7 +123,7 @@ void OneSixVersionBuilder::buildInternal(const bool onlyVanilla, const QStringLi for (auto order : files.keys()) { QLOG_DEBUG() << "Applying file with order" << order; - auto filePair = files[order]; + auto & filePair = files[order]; filePair.second.applyTo(m_version); } } while(0); diff --git a/logic/VersionFile.h b/logic/VersionFile.h index 0f183ae8..0475f927 100644 --- a/logic/VersionFile.h +++ b/logic/VersionFile.h @@ -64,7 +64,7 @@ public: /* methods */ void applyTo(VersionFinal *version); public: /* data */ - int order; + int order = 0; QString name; QString fileId; QString version; |