From 69c3e7111f93290d1278d6116e9fd50079b4fe79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sun, 11 May 2014 12:37:21 +0200
Subject: Make 1.6+ work with new instance format.

---
 logic/OneSixUpdate.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'logic/OneSixUpdate.h')

diff --git a/logic/OneSixUpdate.h b/logic/OneSixUpdate.h
index 00f7c135..139143db 100644
--- a/logic/OneSixUpdate.h
+++ b/logic/OneSixUpdate.h
@@ -36,9 +36,7 @@ public:
 
 private
 slots:
-	void versionFileStart();
-	void versionFileFinished();
-	void versionFileFailed();
+	void versionUpdateFailed(QString reason);
 
 	void jarlibStart();
 	void jarlibFinished();
@@ -58,12 +56,14 @@ slots:
 	void stripJar(QString origPath, QString newPath);
 	bool MergeZipFiles(QuaZip *into, QString from);
 private:
-	NetJobPtr specificVersionDownloadJob;
 	NetJobPtr jarlibDownloadJob;
 	NetJobPtr legacyDownloadJob;
 
-	// target version, determined during this task
+	/// target version, determined during this task
 	std::shared_ptr<MinecraftVersion> targetVersion;
+	/// the task that is spawned for version updates
+	std::shared_ptr<Task> versionUpdateTask;
+	
 	OneSixInstance *m_inst = nullptr;
 	QString jarHashOnEntry;
 	QList<FMLlib> fmlLibsToProcess;
-- 
cgit v1.2.3