2 files changed, 8 insertions, 2 deletions
diff --git a/logic/auth/YggdrasilTask.cpp b/logic/auth/YggdrasilTask.cpp
index 277d7bfd..7679b11f 100644
--- a/logic/auth/YggdrasilTask.cpp
+++ b/logic/auth/YggdrasilTask.cpp
@@ -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;
diff --git a/logic/auth/YggdrasilTask.h b/logic/auth/YggdrasilTask.h
index 4a87067a..b24f909f 100644
--- a/logic/auth/YggdrasilTask.h
+++ b/logic/auth/YggdrasilTask.h
@@ -120,7 +120,7 @@ slots:
 public
 slots:
 	virtual void abort() override;
-
+	void abortByTimeout();
 protected:
 	// FIXME: segfault disaster waiting to happen
 	MojangAccount *m_account = nullptr;