From 0c5c130f9f226ebd9e6794d608b52221c2855c7a Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Sat, 16 Apr 2011 04:07:34 +0900
Subject: [PATCH] more robust deck load on startup

---
 aqt/main.py          | 5 ++++-
 aqt/progress.py      | 1 +
 designer/addcards.ui | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/aqt/main.py b/aqt/main.py
index 703263a88..4136ef669 100755
--- a/aqt/main.py
+++ b/aqt/main.py
@@ -51,7 +51,10 @@ class AnkiQt(QMainWindow):
             # load a deck?
             if (args or self.config['loadLastDeck'] or
                 len(self.config['recentDeckPaths']) == 1):
-                self.maybeLoadLastDeck(args)
+                # delay load so deck errors don't cause program to close
+                self.progress.timer(10, lambda a=args: \
+                                    self.maybeLoadLastDeck(a),
+                                    False)
             else:
                 self.moveToState("deckBrowser")
         except:
diff --git a/aqt/progress.py b/aqt/progress.py
index 322d8af10..2b7a53306 100644
--- a/aqt/progress.py
+++ b/aqt/progress.py
@@ -18,6 +18,7 @@ class ProgressManager(object):
     def __init__(self, mw):
         self.mw = mw
         self.app = QApplication.instance()
+        self.inDB = False
         self._win = None
         self._levels = 0
 
diff --git a/designer/addcards.ui b/designer/addcards.ui
index 19b57956c..c3e9b75a7 100644
--- a/designer/addcards.ui
+++ b/designer/addcards.ui
@@ -22,7 +22,7 @@
     <number>3</number>
    </property>
    <property name="margin">
-    <number>0</number>
+    <number>12</number>
    </property>
    <item>
     <layout class="QGridLayout">