From 35b89e4c358e28400f7ad71d5cb4d64cf12c73b5 Mon Sep 17 00:00:00 2001
From: luxick <git@luxick.com>
Date: Wed, 26 Jul 2017 14:03:59 +0200
Subject: [PATCH] Properly cancel download thread.

---
 cardvault/application.py | 4 ++--
 cardvault/handlers.py    | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cardvault/application.py b/cardvault/application.py
index d442842..edc2840 100644
--- a/cardvault/application.py
+++ b/cardvault/application.py
@@ -110,7 +110,7 @@ class Application:
             supertypes = " - " + " ".join(card.subtypes)
         types = " ".join(card.types) + supertypes
         builder.get_object("cardTypes").set_text(types)
-        # Rarityget_card_image
+        # Rarity
         builder.get_object("cardRarity").set_text(card.rarity if card.rarity else "")
         # Release
         builder.get_object("cardReleaseDate").set_text(card.release_date if card.release_date else "")
@@ -150,7 +150,7 @@ class Application:
 
         window.show_all()
 
-        def eval_key_pressed(widget,event):
+        def eval_key_pressed(widget, event):
             key, modifier = Gtk.accelerator_parse('Escape')
             keyval = event.keyval
             if keyval == key:
diff --git a/cardvault/handlers.py b/cardvault/handlers.py
index 6002dc6..51ebb24 100644
--- a/cardvault/handlers.py
+++ b/cardvault/handlers.py
@@ -165,6 +165,10 @@ class Handlers(SearchHandlers, LibraryHandlers, WantsHandlers):
         e = time.time()
         util.log("Finished in {}s".format(round(e - s, 3)), util.LogLevel.Info)
 
+        if self.cancel_token:
+            GObject.idle_add(self.download_canceled)
+            return
+
         self.app.db_delete_card_data()
 
         GObject.idle_add(self.load_show_insert_ui, "Saving data to disk...")