Merge remote-tracking branch 'origin/feature_fix_log' into integration_butchery

Conflicts: logic/MinecraftProcess.cpp
2014-03-09 23:59:30 +01:00
parent 7fd56a30bd 91faaa5b59
commit d18b97ae3d
2 changed files with 14 additions and 1 deletions
--- a/logic/OneSixInstance.cpp
+++ b/logic/OneSixInstance.cpp
@@ -425,7 +425,19 @@ bool OneSixInstance::providesVersionFile() const

 bool OneSixInstance::reload()
 {
-	return BaseInstance::reload() && reloadVersion();
+	if(BaseInstance::reload())
+	{
+		try
+		{
+			reloadVersion();
+			return true;
+		}
+		catch (...)
+		{
+			return false;
+		}
+	}
+	return false;
 }

 QString OneSixInstance::loaderModsDir() const