From a98e1df10cef774672e919497c43373e86c77f97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Thu, 28 May 2015 09:36:58 +0200 Subject: GH-1011 fetch missing versions when customizing/reverting Minecraft patches --- logic/minecraft/MinecraftVersionList.cpp | 1 + logic/minecraft/OneSixProfileStrategy.cpp | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) (limited to 'logic') diff --git a/logic/minecraft/MinecraftVersionList.cpp b/logic/minecraft/MinecraftVersionList.cpp index 90ef5ebe..c20534e9 100644 --- a/logic/minecraft/MinecraftVersionList.cpp +++ b/logic/minecraft/MinecraftVersionList.cpp @@ -599,6 +599,7 @@ void MinecraftVersionList::saveCachedList() QJsonObject entryObj; entryObj.insert("id", mcversion->descriptor()); + entryObj.insert("version", mcversion->descriptor()); entryObj.insert("time", mcversion->m_updateTimeString); entryObj.insert("releaseTime", mcversion->m_releaseTimeString); entryObj.insert("type", mcversion->m_type); diff --git a/logic/minecraft/OneSixProfileStrategy.cpp b/logic/minecraft/OneSixProfileStrategy.cpp index b7ba2bf6..cd8fd976 100644 --- a/logic/minecraft/OneSixProfileStrategy.cpp +++ b/logic/minecraft/OneSixProfileStrategy.cpp @@ -275,19 +275,19 @@ bool OneSixProfileStrategy::customizePatch(ProfilePatchPtr patch) { return false; } - QSaveFile jsonFile(filename); - if(!jsonFile.open(QIODevice::WriteOnly)) - { - return false; - } - auto document = patch->toJson(true); - jsonFile.write(document.toJson()); - if(!jsonFile.commit()) - { - return false; - } try { + QSaveFile jsonFile(filename); + if(!jsonFile.open(QIODevice::WriteOnly)) + { + return false; + } + auto document = patch->toJson(true); + jsonFile.write(document.toJson()); + if(!jsonFile.commit()) + { + return false; + } load(); } catch (VersionIncomplete &error) -- cgit v1.2.3