From c335ea2ceeb0ecefd5a1a8353e486698434ac5d7 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Tue, 8 Jan 2013 21:39:37 +0900
Subject: [PATCH] note type manager needs to ignore the default note type for
 current deck

---
 anki/collection.py | 4 ++--
 anki/models.py     | 4 ++--
 aqt/models.py      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/anki/collection.py b/anki/collection.py
index 7d07bd0ef..e0c1497e4 100644
--- a/anki/collection.py
+++ b/anki/collection.py
@@ -227,9 +227,9 @@ crt=?, mod=?, scm=?, dty=?, usn=?, ls=?, conf=?""",
     def noteCount(self):
         return self.db.scalar("select count() from notes")
 
-    def newNote(self):
+    def newNote(self, forDeck=True):
         "Return a new note with the current model."
-        return anki.notes.Note(self, self.models.current())
+        return anki.notes.Note(self, self.models.current(forDeck))
 
     def addNote(self, note):
         "Add a note to the collection. Return number of new cards."
diff --git a/anki/models.py b/anki/models.py
index 870be3724..64a4f1798 100644
--- a/anki/models.py
+++ b/anki/models.py
@@ -100,10 +100,10 @@ class ModelManager(object):
     # Retrieving and creating models
     #############################################################
 
-    def current(self):
+    def current(self, forDeck=True):
         "Get current model."
         m = self.get(self.col.decks.current().get('mid'))
-        if not m:
+        if not forDeck or not m:
             m = self.get(self.col.conf['curModel'])
         return m or self.models.values()[0]
 
diff --git a/aqt/models.py b/aqt/models.py
index 7984a493b..ffaf20447 100644
--- a/aqt/models.py
+++ b/aqt/models.py
@@ -123,7 +123,7 @@ class Models(QDialog):
 
     def _tmpNote(self):
         self.mm.setCurrent(self.model)
-        n = self.col.newNote()
+        n = self.col.newNote(forDeck=False)
         for name in n.keys():
             n[name] = "("+name+")"
         if "{{cloze:Text}}" in self.model['tmpls'][0]['qfmt']: