CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-352 Make OneSix instance update downloads cancellable

Browse Source
This commit is contained in:
Petr Mrázek
2016-08-14 02:33:31 +02:00
parent 2f0441b3c1
commit 042f3ef55c
32 changed files with 796 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/logic/minecraft/legacy/LegacyInstance.cpp
View File

@ -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()

2
api/logic/minecraft/legacy/LegacyInstance.h
View File

@ -113,7 +113,7 @@ public:
virtual bool shouldUpdate() const override;
virtual void setShouldUpdate(bool val) override;
virtual std::shared_ptr<Task> createUpdateTask() override;
virtual shared_qobject_ptr<Task> createUpdateTask() override;
virtual std::shared_ptr<Task> createJarModdingTask() override;
virtual QString createLaunchScript(AuthSessionPtr session) override;