Fetching correct DeckID

ankidroid · Dec 16, 2024 · a538e27 · a538e27
1 parent 0ea255d
commit a538e27
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt
@@ -2239,7 +2239,11 @@ class NoteEditor :
         fun calculateDeckId(): DeckId {
             if (deckId != 0L) return deckId
             if (note != null && !addNote && currentEditedCard != null) {
-                return currentEditedCard!!.currentDeckId().did
+                val deckId = currentEditedCard!!.currentDeckId().did
+                if (deckId == 0L && note.notetype.did != 0L) {
+                    return note.notetype.did
+                }
+                return deckId
             }
 
             if (!getColUnsafe.config.getBool(ConfigKey.Bool.ADDING_DEFAULTS_TO_CURRENT_DECK)) {