From 73f8bc5c92cb4a9b7ce507309001c6b206b5c8eb Mon Sep 17 00:00:00 2001
From: Petr Mrázek <peterix@gmail.com>
Date: Thu, 10 Oct 2013 01:47:48 +0200
Subject: Version changing removes any existing version json.

---
 logic/OneSixInstance.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'logic/OneSixInstance.cpp')

diff --git a/logic/OneSixInstance.cpp b/logic/OneSixInstance.cpp
index ad3f9f58..1b7b5bb4 100644
--- a/logic/OneSixInstance.cpp
+++ b/logic/OneSixInstance.cpp
@@ -192,6 +192,11 @@ bool OneSixInstance::setIntendedVersionId(QString version)
 {
 	settings().set("IntendedVersion", version);
 	setShouldUpdate(true);
+	auto pathCustom = PathCombine(instanceRoot(), "custom.json");
+	auto pathOrig = PathCombine(instanceRoot(), "version.json");
+	QFile::remove(pathCustom);
+	QFile::remove(pathOrig);
+	reloadFullVersion();
 	return true;
 }
 
@@ -271,7 +276,11 @@ bool OneSixInstance::reloadFullVersion()
 		d->version = version;
 		return true;
 	}
-	return false;
+	else
+	{
+		d->version.reset();
+		return false;
+	}
 }
 
 std::shared_ptr<OneSixVersion> OneSixInstance::getFullVersion()
-- 
cgit