diff options
| author | George Hazan <george.hazan@gmail.com> | 2025-05-14 15:18:18 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2025-05-14 15:18:23 +0300 |
| commit | 12fb164547e8ba5df078244116ecb096590a35ea (patch) | |
| tree | 288f707db7c53bf31cffd48bd4ae517beb40be2b /plugins/NotesAndReminders/src | |
| parent | 50304e12ccbaaa7e77ef74b22d7a194a50106c6d (diff) | |
fixes #5001 (Notes and Reminders: добавляется лишний день)
Diffstat (limited to 'plugins/NotesAndReminders/src')
| -rw-r--r-- | plugins/NotesAndReminders/src/reminders.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/plugins/NotesAndReminders/src/reminders.cpp b/plugins/NotesAndReminders/src/reminders.cpp index b0e3300a34..6e8a765304 100644 --- a/plugins/NotesAndReminders/src/reminders.cpp +++ b/plugins/NotesAndReminders/src/reminders.cpp @@ -15,13 +15,9 @@ /////////////////////////////////////////////////////////////////////////////////////////
-static bool EqualOrLess(const SYSTEMTIME &t1, const SYSTEMTIME &t2)
+static bool date2int(const SYSTEMTIME &t)
{
- if (t2.wYear > t1.wYear)
- return false;
- if (t2.wMonth > t1.wMonth)
- return false;
- return t1.wDay <= t2.wDay;
+ return (t.wYear * 1000 + t.wMonth) * 100 + t.wDay;
}
static void RemoveReminderSystemEvent(struct REMINDERDATA *p);
@@ -731,7 +727,7 @@ protected: SYSTEMTIME tm;
GetSystemTime(&tm);
- bool bTomorrow = EqualOrLess(pDate, tm) && (h * 60 + m) < (pDate.wHour * 60 + pDate.wMinute);
+ bool bTomorrow = date2int(tm) >= date2int(pDate) && (h * 60 + m) < (pDate.wHour * 60 + pDate.wMinute);
pDate.wHour = h;
pDate.wMinute = m;
|