diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-12-08 17:34:45 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-12-08 17:34:45 +0100 |
| commit | 0cb8ff40b26401a707781c2c4171d3ec6c114077 (patch) | |
| tree | 0e075c830b67f8b15d5359d06d1026987dc5c124 /logic/OneSixInstance.h | |
| parent | f028aa76bc5d28b7fc4d1ea4e194895690e9944e (diff) | |
| download | MultiMC-0cb8ff40b26401a707781c2c4171d3ec6c114077.tar MultiMC-0cb8ff40b26401a707781c2c4171d3ec6c114077.tar.gz MultiMC-0cb8ff40b26401a707781c2c4171d3ec6c114077.tar.lz MultiMC-0cb8ff40b26401a707781c2c4171d3ec6c114077.tar.xz MultiMC-0cb8ff40b26401a707781c2c4171d3ec6c114077.zip | |
Finish preliminary offline support
* ProgressProvider now has an abort() call
* Abort button support added to the progress dialog
* YggdrasilTask and MojangAccount adapted to support abort
YggdrasilTask will time out after 10 seconds of no network activity, or when the user pushes the Play Offline button.
In offline mode, all instance update tasks are skipped! This will need further work.
Diffstat (limited to 'logic/OneSixInstance.h')
| -rw-r--r-- | logic/OneSixInstance.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/logic/OneSixInstance.h b/logic/OneSixInstance.h index 042c104b..7ea2d08b 100644 --- a/logic/OneSixInstance.h +++ b/logic/OneSixInstance.h @@ -39,7 +39,7 @@ public: QString loaderModsDir() const; virtual QString instanceConfigFolder() const override; - virtual Task *doUpdate(bool prepare_for_launch) override; + virtual std::shared_ptr<Task> doUpdate(bool prepare_for_launch) override; virtual MinecraftProcess *prepareForLaunch(MojangAccountPtr account) override; virtual void cleanupAfterRun() override; |