CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missed version file assignment.

Browse Source
This commit is contained in:
Petr Mrázek
2014-03-03 09:08:32 +01:00
parent d66f2500a6
commit 011ea84530
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
logic/OneSixVersionBuilder.cpp
View File

@@ -90,8 +90,7 @@ void OneSixVersionBuilder::buildInternal(const bool onlyVanilla, const QStringLi
{ {
// version.json // version.json
QLOG_INFO() << "Reading version.json"; QLOG_INFO() << "Reading version.json";
VersionFile file; VersionFile file = parseJsonFile(QFileInfo(root.absoluteFilePath("version.json")), false);
parseJsonFile(QFileInfo(root.absoluteFilePath("version.json")), false, &file);
file.name = "Minecraft"; file.name = "Minecraft";
file.fileId = "org.multimc.version.json"; file.fileId = "org.multimc.version.json";
file.version = m_instance->intendedVersionId(); file.version = m_instance->intendedVersionId();
@@ -124,7 +123,7 @@ void OneSixVersionBuilder::buildInternal(const bool onlyVanilla, const QStringLi
for (auto order : files.keys()) for (auto order : files.keys())
{ {
QLOG_DEBUG() << "Applying file with order" << order; QLOG_DEBUG() << "Applying file with order" << order;
auto filePair = files[order]; auto & filePair = files[order];
filePair.second.applyTo(m_version); filePair.second.applyTo(m_version);
} }
} while(0); } while(0);

2
logic/VersionFile.h
View File

@@ -64,7 +64,7 @@ public: /* methods */
void applyTo(VersionFinal *version); void applyTo(VersionFinal *version);
public: /* data */ public: /* data */
int order; int order = 0;
QString name; QString name;
QString fileId; QString fileId;
QString version; QString version;