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

Make some more error messages translateable.

Browse Source
This commit is contained in:
Petr Mrázek
2014-03-23 19:07:13 +01:00
parent a01b1707de
commit 4a24ea6c38
10 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
logic/auth/YggdrasilTask.cpp
View File

@ -54,7 +54,7 @@ void YggdrasilTask::executeTask()
counter.setSingleShot(false);
counter.start(time_step);
progress(0, timeout_max);
connect(&timeout_keeper, &QTimer::timeout, this, &YggdrasilTask::abort);
connect(&timeout_keeper, &QTimer::timeout, this, &YggdrasilTask::abortByTimeout);
connect(&counter, &QTimer::timeout, this, &YggdrasilTask::heartbeat);
}
@ -76,6 +76,12 @@ void YggdrasilTask::abort()
m_netReply->abort();
}
void YggdrasilTask::abortByTimeout()
{
progress(timeout_max, timeout_max);
m_netReply->abort();
}
void YggdrasilTask::sslErrors(QList<QSslError> errors)
{
int i = 1;

2
logic/auth/YggdrasilTask.h
View File

@ -120,7 +120,7 @@ slots:
public
slots:
virtual void abort() override;
void abortByTimeout();
protected:
// FIXME: segfault disaster waiting to happen
MojangAccount *m_account = nullptr;