From 3cec1a35dc837b8ab01dd3d080ff4635fdf70207 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Mon, 2 Aug 2021 15:02:03 +1000
Subject: [PATCH] update learning cutoff when counts are zero

---
 rslib/src/scheduler/queue/learning.rs |  2 +-
 rslib/src/scheduler/queue/mod.rs      | 22 ++++++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/rslib/src/scheduler/queue/learning.rs b/rslib/src/scheduler/queue/learning.rs
index 0b30a5ac4..cdbe2e460 100644
--- a/rslib/src/scheduler/queue/learning.rs
+++ b/rslib/src/scheduler/queue/learning.rs
@@ -35,7 +35,7 @@ impl CardQueues {
 
     /// Increase the cutoff to the current time, and increase the learning count
     /// for any new cards that now fall within the cutoff.
-    pub(super) fn check_for_newly_due_intraday_learning(&mut self) -> Box<CutoffSnapshot> {
+    pub(super) fn update_learning_cutoff_and_count(&mut self) -> Box<CutoffSnapshot> {
         let change = CutoffSnapshot {
             learning_count: self.counts.learning,
             learning_cutoff: self.current_learning_cutoff,
diff --git a/rslib/src/scheduler/queue/mod.rs b/rslib/src/scheduler/queue/mod.rs
index 535fb2e69..5d7a9fdbd 100644
--- a/rslib/src/scheduler/queue/mod.rs
+++ b/rslib/src/scheduler/queue/mod.rs
@@ -26,8 +26,9 @@ pub(crate) struct CardQueues {
     selected_deck: DeckId,
     current_day: u32,
     learn_ahead_secs: i64,
-    /// Updated each time a card is answered. Ensures we don't show a newly-due
-    /// learning card after a user returns from editing a review card.
+    /// Updated each time a card is answered, and by get_queued_cards() when the
+    /// counts are zero. Ensures we don't show a newly-due learning card after a
+    /// user returns from editing a review card.
     current_learning_cutoff: TimestampSecs,
 }
 
@@ -38,6 +39,12 @@ pub struct Counts {
     pub review: usize,
 }
 
+impl Counts {
+    fn all_zero(self) -> bool {
+        self.new == 0 && self.learning == 0 && self.review == 0
+    }
+}
+
 #[derive(Debug, Clone)]
 pub struct QueuedCard {
     pub card: Card,
@@ -148,7 +155,14 @@ impl CardQueues {
         }
     }
 
-    pub(crate) fn counts(&self) -> Counts {
+    /// Return the current due counts. If there are no due cards, the learning
+    /// cutoff is updated to the current time first, and any newly-due learning
+    /// cards are added to the counts.
+    pub(crate) fn counts(&mut self) -> Counts {
+        if self.counts.all_zero() {
+            // we discard the returned undo information in this case
+            self.update_learning_cutoff_and_count();
+        }
         self.counts
     }
 
@@ -179,7 +193,7 @@ impl Collection {
         if let Some(queues) = &mut self.state.card_queues {
             let entry = queues.pop_entry(card.id)?;
             let requeued_learning = queues.maybe_requeue_learning_card(card, timing);
-            let cutoff_change = queues.check_for_newly_due_intraday_learning();
+            let cutoff_change = queues.update_learning_cutoff_and_count();
             self.save_queue_update_undo(Box::new(QueueUpdate {
                 entry,
                 learning_requeue: requeued_learning,