diff options
| author | Ezekiel Smith <ezekielsmith@protonmail.com> | 2022-07-03 01:50:36 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-03 01:50:36 +1000 |
| commit | 7f22994f6889706ba667baca32968787fe86ad44 (patch) | |
| tree | 7271bac27d2954c73c277a29baf94961d282b49a /launcher/minecraft/auth/MinecraftAccount.cpp | |
| parent | 7aba7b60641c74ead1f57c3ebe6a56c93dd4d5d1 (diff) | |
| parent | 5da87d190464421b4dc50810aaf9619f1ef29d5a (diff) | |
| download | PrismLauncher-7f22994f6889706ba667baca32968787fe86ad44.tar.gz PrismLauncher-7f22994f6889706ba667baca32968787fe86ad44.tar.bz2 PrismLauncher-7f22994f6889706ba667baca32968787fe86ad44.zip | |
Merge pull request #831 from flowln/abort_connections
Add missing connections to the abort signal in some tasks
Diffstat (limited to 'launcher/minecraft/auth/MinecraftAccount.cpp')
| -rw-r--r-- | launcher/minecraft/auth/MinecraftAccount.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/launcher/minecraft/auth/MinecraftAccount.cpp b/launcher/minecraft/auth/MinecraftAccount.cpp index ec86fa5c..9c8eb70b 100644 --- a/launcher/minecraft/auth/MinecraftAccount.cpp +++ b/launcher/minecraft/auth/MinecraftAccount.cpp @@ -135,6 +135,7 @@ shared_qobject_ptr<AccountTask> MinecraftAccount::login(QString password) { m_currentTask.reset(new MojangLogin(&data, password)); connect(m_currentTask.get(), SIGNAL(succeeded()), SLOT(authSucceeded())); connect(m_currentTask.get(), SIGNAL(failed(QString)), SLOT(authFailed(QString))); + connect(m_currentTask.get(), &Task::aborted, this, [this]{ authFailed(tr("Aborted")); }); emit activityChanged(true); return m_currentTask; } @@ -145,6 +146,7 @@ shared_qobject_ptr<AccountTask> MinecraftAccount::loginMSA() { m_currentTask.reset(new MSAInteractive(&data)); connect(m_currentTask.get(), SIGNAL(succeeded()), SLOT(authSucceeded())); connect(m_currentTask.get(), SIGNAL(failed(QString)), SLOT(authFailed(QString))); + connect(m_currentTask.get(), &Task::aborted, this, [this]{ authFailed(tr("Aborted")); }); emit activityChanged(true); return m_currentTask; } @@ -155,6 +157,7 @@ shared_qobject_ptr<AccountTask> MinecraftAccount::loginOffline() { m_currentTask.reset(new OfflineLogin(&data)); connect(m_currentTask.get(), SIGNAL(succeeded()), SLOT(authSucceeded())); connect(m_currentTask.get(), SIGNAL(failed(QString)), SLOT(authFailed(QString))); + connect(m_currentTask.get(), &Task::aborted, this, [this]{ authFailed(tr("Aborted")); }); emit activityChanged(true); return m_currentTask; } @@ -176,6 +179,7 @@ shared_qobject_ptr<AccountTask> MinecraftAccount::refresh() { connect(m_currentTask.get(), SIGNAL(succeeded()), SLOT(authSucceeded())); connect(m_currentTask.get(), SIGNAL(failed(QString)), SLOT(authFailed(QString))); + connect(m_currentTask.get(), &Task::aborted, this, [this]{ authFailed(tr("Aborted")); }); emit activityChanged(true); return m_currentTask; } |