Sync from quickmods

2014-09-06 18:16:56 +02:00
parent 36efcf8d3c
commit 20cb97a35a
57 changed files with 569 additions and 326 deletions
--- a/logic/minecraft/VersionBuilder.cpp
+++ b/logic/minecraft/VersionBuilder.cpp
@ -288,6 +288,11 @@ static const int currentOrderFileVersion = 1;
 bool VersionBuilder::readOverrideOrders(OneSixInstance *instance, PatchOrder &order)
 {
 	QFile orderFile(instance->instanceRoot() + "/order.json");
+	if (!orderFile.exists())
+	{
+		QLOG_WARN() << "Order file doesn't exist. Ignoring.";
+		return false;
+	}
 	if (!orderFile.open(QFile::ReadOnly))
 	{
 		QLOG_ERROR() << "Couldn't open" << orderFile.fileName()