Fix counting new mails in maildir

gahr · flatcap · commit b5a30f06eddc · 2023-05-09T15:29:22.000+01:00
We only want to change msg_new if we're gathering stats. If we are only checking whether the mailbox has any new messages, we'll stop at the first new message we encounter, so msg_new would always be 1. Fixes #3843
diff --git a/maildir/maildir.c b/maildir/maildir.c
@@ -149,10 +149,14 @@ static void maildir_check_dir(struct Mailbox *m, const char *dir_name,
           }
         }
         m->has_new = true;
-        check_new = false;
-        m->msg_new++;
-        if (!check_stats)
+        if (check_stats)
+        {
+          m->msg_new++;
+        }
+        else
+        {
           break;
+        }
       }
     }
   }
@@ -1354,10 +1358,10 @@ static enum MxStatus maildir_mbox_check_stats(struct Mailbox *m, uint8_t flags)
 {
   bool check_stats = flags & MUTT_MAILBOX_CHECK_FORCE_STATS;
   bool check_new = true;
-  m->msg_new = 0;
 
   if (check_stats)
   {
+    m->msg_new = 0;
     m->msg_count = 0;
     m->msg_unread = 0;
     m->msg_flagged = 0;

Original file line number	Diff line number	Diff line change
`@@ -149,10 +149,14 @@ static void maildir_check_dir(struct Mailbox m, const char dir_name,`
`149`	`149`	`}`
`150`	`150`	`}`
`151`	`151`	`m->has_new = true;`
`152`		`- check_new = false;`
`153`		`- m->msg_new++;`
`154`		`- if (!check_stats)`
	`152`	`+ if (check_stats)`
	`153`	`+ {`
	`154`	`+ m->msg_new++;`
	`155`	`+ }`
	`156`	`+ else`
	`157`	`+ {`
`155`	`158`	`break;`
	`159`	`+ }`
`156`	`160`	`}`
`157`	`161`	`}`
`158`	`162`	`}`
`@@ -1354,10 +1358,10 @@ static enum MxStatus maildir_mbox_check_stats(struct Mailbox *m, uint8_t flags)`
`1354`	`1358`	`{`
`1355`	`1359`	`bool check_stats = flags & MUTT_MAILBOX_CHECK_FORCE_STATS;`
`1356`	`1360`	`bool check_new = true;`
`1357`		`- m->msg_new = 0;`
`1358`	`1361`
`1359`	`1362`	`if (check_stats)`
`1360`	`1363`	`{`
	`1364`	`+ m->msg_new = 0;`
`1361`	`1365`	`m->msg_count = 0;`
`1362`	`1366`	`m->msg_unread = 0;`
`1363`	`1367`	`m->msg_flagged = 0;`