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.cpp | |
| parent | f028aa76bc5d28b7fc4d1ea4e194895690e9944e (diff) | |
| download | PrismLauncher-0cb8ff40b26401a707781c2c4171d3ec6c114077.tar.gz PrismLauncher-0cb8ff40b26401a707781c2c4171d3ec6c114077.tar.bz2 PrismLauncher-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.cpp')
| -rw-r--r-- | logic/OneSixInstance.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/logic/OneSixInstance.cpp b/logic/OneSixInstance.cpp index 5362e894..7a1d7dad 100644 --- a/logic/OneSixInstance.cpp +++ b/logic/OneSixInstance.cpp @@ -37,9 +37,9 @@ OneSixInstance::OneSixInstance(const QString &rootDir, SettingsObject *setting_o reloadFullVersion(); } -Task *OneSixInstance::doUpdate(bool prepare_for_launch) +std::shared_ptr<Task> OneSixInstance::doUpdate(bool prepare_for_launch) { - return new OneSixUpdate(this, prepare_for_launch); + return std::shared_ptr<Task> (new OneSixUpdate(this, prepare_for_launch)); } QString replaceTokensIn(QString text, QMap<QString, QString> with) |