From 383317d3114054705b4369134c1e9391d58e6b6a Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Fri, 16 Jan 2009 20:22:04 +0900
Subject: [PATCH] turn off progress on error

---
 ankiqt/ui/importing.py | 2 +-
 ankiqt/ui/main.py      | 8 +++++---
 ankiqt/ui/utils.py     | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ankiqt/ui/importing.py b/ankiqt/ui/importing.py
index c252f0470..7325ce0f1 100644
--- a/ankiqt/ui/importing.py
+++ b/ankiqt/ui/importing.py
@@ -126,6 +126,7 @@ class ImportDialog(QDialog):
                 self.dialog.status.setText(msg)
                 return
         finally:
+            self.parent.deck.finishProgress()
             self.parent.deck.setUndoEnd(n)
         txt = (
             _("Importing complete. %(num)d cards imported from %(file)s.\n") %
@@ -136,7 +137,6 @@ class ImportDialog(QDialog):
         self.dialog.status.setText(txt)
         self.file = None
         self.maybePreview()
-        self.parent.deck.updateAllPriorities()
         self.parent.reset()
 
     def setupMappingFrame(self):
diff --git a/ankiqt/ui/main.py b/ankiqt/ui/main.py
index 677c0e610..2dbc3eed1 100644
--- a/ankiqt/ui/main.py
+++ b/ankiqt/ui/main.py
@@ -1942,11 +1942,13 @@ day = :d""", d=yesterday)
                                                 title, min, max)
 
     def onUpdateProgress(self, label=None, value=None):
-        self.progressWin.update(label, value)
+        if self.progressWin:
+            self.progressWin.update(label, value)
 
     def onFinishProgress(self):
-        self.progressWin.finish()
-        self.progressWin = None
+        if self.progressWin:
+            self.progressWin.finish()
+            self.progressWin = None
 
     # Advanced features
     ##########################################################################
diff --git a/ankiqt/ui/utils.py b/ankiqt/ui/utils.py
index 99f455518..bf09c56c7 100644
--- a/ankiqt/ui/utils.py
+++ b/ankiqt/ui/utils.py
@@ -195,17 +195,17 @@ class ProgressWin(object):
         self.diag.setAutoClose(False)
         self.diag.setAutoReset(False)
         self.diag.setMinimumDuration(0)
-        self.diag.show()
         self.counter = min
         self.min = min
         self.max = max
         self.lastTime = time.time()
         self.app = QApplication.instance()
+        self.diag.show()
         self.app.processEvents()
 
     def update(self, label=None, value=None):
         self.app.processEvents()
-        print self.min, self.counter, self.max, label, time.time() - self.lastTime
+        #print self.min, self.counter, self.max, label, time.time() - self.lastTime
         self.lastTime = time.time()
         if label:
             self.diag.setLabelText(label)