GH-352 Make OneSix instance update downloads cancellable

2016-08-14 02:33:31 +02:00
parent 2f0441b3c1
commit 042f3ef55c
32 changed files with 796 additions and 360 deletions
--- a/api/logic/minecraft/legacy/LegacyInstance.cpp
+++ b/api/logic/minecraft/legacy/LegacyInstance.cpp
@ -87,12 +87,12 @@ bool LegacyInstance::shouldUseCustomBaseJar() const
 }


-std::shared_ptr<Task> LegacyInstance::createUpdateTask()
+shared_qobject_ptr<Task> LegacyInstance::createUpdateTask()
 {
 	// make sure the jar mods list is initialized by asking for it.
 	auto list = jarModList();
 	// create an update task
-	return std::shared_ptr<Task>(new LegacyUpdate(this, this));
+	return shared_qobject_ptr<Task>(new LegacyUpdate(this, this));
 }

 std::shared_ptr<Task> LegacyInstance::createJarModdingTask()