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/auth/MojangAccount.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/auth/MojangAccount.h')
| -rw-r--r-- | logic/auth/MojangAccount.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/logic/auth/MojangAccount.h b/logic/auth/MojangAccount.h index 751aafe5..8c44ce58 100644 --- a/logic/auth/MojangAccount.h +++ b/logic/auth/MojangAccount.h @@ -23,6 +23,7 @@ #include <memory> +class Task; class YggdrasilTask; class MojangAccount; @@ -94,7 +95,7 @@ public: /* manipulation */ * Attempt to login. Empty password means we use the token. * If the attempt fails because we already are performing some task, it returns false. */ - bool login(QString password = QString()); + std::shared_ptr<Task> login(QString password = QString()); public: /* queries */ const QString &username() const |