From 5b9675f0504e65ccee46b1ecc304d14e4f0da770 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 15 Apr 2019 18:37:53 +0300 Subject: merge of fixes with trunk --- plugins/NotesAndReminders/src/reminders.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/NotesAndReminders/src/reminders.cpp') diff --git a/plugins/NotesAndReminders/src/reminders.cpp b/plugins/NotesAndReminders/src/reminders.cpp index 920ac3142e..547dc262af 100644 --- a/plugins/NotesAndReminders/src/reminders.cpp +++ b/plugins/NotesAndReminders/src/reminders.cpp @@ -1253,6 +1253,7 @@ public: void onClick_RemindAgain(CCtrlButton*) { + arReminders.remove(m_pReminder); if (chkAfter.GetState()) { // delta time SYSTEMTIME tm; @@ -1320,7 +1321,6 @@ public: m_pReminder->handle = nullptr; // re-insert tree item sorted - arReminders.remove(m_pReminder); arReminders.insert(m_pReminder); m_pReminder = nullptr; // prevent reminder from being deleted; Close(); @@ -1533,6 +1533,7 @@ public: } else { // update existing reminder + arReminders.remove(m_pReminder); SystemTimeToFileTime(&Date, (FILETIME*)&m_pReminder->When); m_pReminder->szText = ptrA(edtText.GetTextA()); @@ -1541,7 +1542,6 @@ public: m_pReminder->RepeatSound = m_pReminder->SoundSel < 0 ? 0 : (UINT)RepeatSound; // re-insert tree item sorted - arReminders.remove(m_pReminder); arReminders.insert(m_pReminder); m_pReminder->bVisible = false; -- cgit v1.2.3