From 1f96489755688ac4c7fe2c3d05a6c791ff9475a3 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Thu, 7 Nov 2024 16:52:50 +1000
Subject: [PATCH] Fix invalid preset search matching cards in filtered decks

https://forums.ankiweb.net/t/anki-24-10-release-candidate/51191/64
---
 rslib/src/search/sqlwriter.rs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/rslib/src/search/sqlwriter.rs b/rslib/src/search/sqlwriter.rs
index 97a6a29a3..7bd06dda2 100644
--- a/rslib/src/search/sqlwriter.rs
+++ b/rslib/src/search/sqlwriter.rs
@@ -842,8 +842,14 @@ impl SqlWriter<'_> {
             self.col.get_config_bool(BoolKey::IgnoreAccentsInSearch),
         )
     }
+
     fn write_deck_preset(&mut self, name: &str) -> Result<()> {
         let dcid = self.col.storage.get_deck_config_id_by_name(name)?;
+        if dcid.is_none() {
+            write!(self.sql, "false").unwrap();
+            return Ok(());
+        };
+
         let mut str_ids = String::new();
         let deck_ids = self
             .col
@@ -1284,6 +1290,13 @@ c.odue != 0 then c.odue else c.due end) != {days}) or (c.queue in (1,4) and
             &s(ctx, "has-cd:r").0,
             "(extract_custom_data(c.data, 'r') is not null)"
         );
+
+        // preset search
+        assert_eq!(
+            &s(ctx, "preset:default").0,
+            "((c.did in (1) or c.odid in (1)))"
+        );
+        assert_eq!(&s(ctx, "preset:typo").0, "(false)");
     }
 
     #[test]