From a2ad76dbb4deb367df2e4da254c88ddd8575ba66 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Wed, 20 Feb 2013 15:25:59 +0900
Subject: [PATCH] default to current deck when selecting (#693)

---
 aqt/browser.py | 9 +++++++--
 aqt/main.py    | 3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/aqt/browser.py b/aqt/browser.py
index 2f96907c6..ff9622ac9 100644
--- a/aqt/browser.py
+++ b/aqt/browser.py
@@ -963,8 +963,14 @@ where id in %s""" % ids2str(sf))
 
     def setDeck(self):
         from aqt.studydeck import StudyDeck
+        cids = self.selectedCards()
+        if not cids:
+            return
+        did = self.mw.col.db.scalar(
+            "select did from cards where id = ?", cids[0])
+        current=self.mw.col.decks.get(did)['name']
         ret = StudyDeck(
-            self.mw, current=None, accept=_("Move Cards"),
+            self.mw, current=current, accept=_("Move Cards"),
             title=_("Change Deck"), help="browse", parent=self)
         if not ret.name:
             return
@@ -978,7 +984,6 @@ where id in %s""" % ids2str(sf))
         mod = intTime()
         usn = self.col.usn()
         # normal cards
-        cids = self.selectedCards()
         scids = ids2str(cids)
         # remove any cards from filtered deck first
         self.col.sched.remFromDyn(cids)
diff --git a/aqt/main.py b/aqt/main.py
index 456d9622e..a6d1f0960 100644
--- a/aqt/main.py
+++ b/aqt/main.py
@@ -891,7 +891,8 @@ will be lost. Continue?"""))
 
     def onStudyDeck(self):
         from aqt.studydeck import StudyDeck
-        ret = StudyDeck(self, dyn=True)
+        ret = StudyDeck(
+            self, dyn=True, current=self.col.decks.current()['name'])
         if ret.name:
             self.col.decks.select(self.col.decks.id(ret.name))
             self.moveToState("overview")