diff options
author | Tim Jenssen <tim.jenssen@digia.com> | 2013-06-07 12:30:01 +0200 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-06-07 13:20:31 +0200 |
commit | 77a40b5bc08f50c05dd31ef7d3ed41996a8ee2b8 (patch) | |
tree | c3d5cab31d9a92683a88b9cfed939c3dd81b682f | |
parent | a2920282e6ce71a76dbc6cabc1f7a86cfc9ce7b5 (diff) |
fix a crash while testing a unresponsive server
Change-Id: I7fdc44a8ca822ea2145c9867a348f8462b894068
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
-rw-r--r-- | src/sdk/settingsdialog.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
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); } } |