1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index f47f33ea..e97eb099 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -192,6 +192,7 @@ void ServerDialog::action(const gcn::ActionEvent &event)
         }
         else
         {
+            mDownload->cancel();
             mQuitButton->setEnabled(false);
             mConnectButton->setEnabled(false);
 
@@ -234,6 +235,7 @@ void ServerDialog::action(const gcn::ActionEvent &event)
     }
     else if (event.getId() == "quit")
     {
+        mDownload->cancel();
         state = STATE_FORCE_QUIT;
     }
     else if (event.getId() == "addEntry")
@@ -401,6 +403,9 @@ void ServerDialog::loadServers()
 int ServerDialog::downloadUpdate(void *ptr, DownloadStatus status,
                                  size_t total, size_t remaining)
 {
+    if (status == DOWNLOAD_STATUS_CANCELLED)
+        return -1;
+
     ServerDialog *sd = reinterpret_cast<ServerDialog*>(ptr);
     bool finished = false;