From 0f46a02f86e2049dd99ac4c7f6478c08f279a589 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 19 Mar 2021 18:05:37 +0300 Subject: =?UTF-8?q?fixes=20#2773=20(Notes=20and=20Reminders:=20=D0=BD?= =?UTF-8?q?=D0=B5=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=20=D0=B2?= =?UTF-8?q?=D1=8B=D1=81=D1=82=D0=B0=D0=B2=D0=B8=D1=82=D1=8C=20=D1=81=D1=83?= =?UTF-8?q?=D1=89=D0=B5=D1=81=D1=82=D0=B2=D1=83=D1=8E=D1=89=D0=B5=D0=B9=20?= =?UTF-8?q?=D0=BD=D0=B0=D0=BF=D0=BE=D0=BC=D0=B8=D0=BD=D0=B0=D0=BB=D0=BA?= =?UTF-8?q?=D0=B5=20=D0=B1=D0=BE=D0=BB=D0=B5=D0=B5=20=D1=80=D0=B0=D0=BD?= =?UTF-8?q?=D0=BD=D0=B5=D0=B5=20=D0=B2=D1=80=D0=B5=D0=BC=D1=8F)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/NotesAndReminders/src/reminders.cpp | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/plugins/NotesAndReminders/src/reminders.cpp b/plugins/NotesAndReminders/src/reminders.cpp index a139f25aa0..d17d7d2643 100644 --- a/plugins/NotesAndReminders/src/reminders.cpp +++ b/plugins/NotesAndReminders/src/reminders.cpp @@ -875,7 +875,6 @@ static bool GetTriggerTime(CCtrlCombo &pCombo, ULONGLONG savedLi, SYSTEMTIME &pD int n = pCombo.GetCurSel(); if (n != -1) { // use preset value -preset_value:; if (IsRelativeCombo(pCombo)) { ULONGLONG li; SystemTimeToFileTime(&pDate, (FILETIME*)&li); @@ -919,28 +918,10 @@ preset_value:; return false; } - if (IsRelativeCombo(pCombo)) { - // date has not been changed, the specified time is a time between reftime and reftime+24h - ULONGLONG li2; - if (ReformatTimeInput(pCombo, savedLi, h, m, &pDate, &li2)) - return FALSE; - - // check if reformatted value is a preset - if ((n = pCombo.GetCurSel()) != -1) - goto preset_value; - - FileTimeToSystemTime((FILETIME*)&li2, &pDate); - return true; - } - + // absolute time (on pDate) if (ReformatTimeInput(pCombo, savedLi, h, m, &pDate, nullptr)) return false; - // check if reformatted value is a preset - if ((n = pCombo.GetCurSel()) != -1) - goto preset_value; - - // absolute time (on pDate) pDate.wHour = h; pDate.wMinute = m; pDate.wSecond = 0; -- cgit v1.2.3