From 77a40b5bc08f50c05dd31ef7d3ed41996a8ee2b8 Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@digia.com>
Date: Fri, 7 Jun 2013 12:30:01 +0200
Subject: fix a crash while testing a unresponsive server

Change-Id: I7fdc44a8ca822ea2145c9867a348f8462b894068
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
---
 src/sdk/settingsdialog.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/sdk/settingsdialog.cpp b/src/sdk/settingsdialog.cpp
index 37628172a..d6dd34e8c 100644
--- a/src/sdk/settingsdialog.cpp
+++ b/src/sdk/settingsdialog.cpp
@@ -126,8 +126,13 @@ void TestRepository::doStart()
 void TestRepository::doCancel()
 {
     if (m_downloader) {
+        QString errorString = m_downloader->errorString();
+        if (errorString.isEmpty())
+            errorString = tr("Got a timeout while testing: '%1'").arg(m_repository.displayname());
+        // at the moment the download sends downloadCompleted() if we cancel it, so just
+        disconnect(m_downloader, 0, this, 0);
         m_downloader->cancelDownload();
-        emitFinishedWithError(KDJob::Canceled, m_downloader->errorString());
+        emitFinishedWithError(KDJob::Canceled, errorString);
     }
 }
 
-- 
cgit v1.2.3