From 8d371aa2b1fa5a7bfe835dee9b60d1407b33047b Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 12 Mar 2014 13:40:35 +0000 Subject: db_event_next/db_event_prev: first parameter hContact added git-svn-id: http://svn.miranda-ng.org/main/trunk@8576 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/BasicHistory/src/EventList.cpp | 5 +++-- plugins/BasicHistory/src/HistoryWindow.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'plugins/BasicHistory') diff --git a/plugins/BasicHistory/src/EventList.cpp b/plugins/BasicHistory/src/EventList.cpp index 6335a11e07..b3648456a7 100644 --- a/plugins/BasicHistory/src/EventList.cpp +++ b/plugins/BasicHistory/src/EventList.cpp @@ -198,8 +198,9 @@ void EventList::GetTempList(std::list& tempList, bool noFilter, ei.isExternal = false; HANDLE hDbEvent = db_event_first(_hContact); while (hDbEvent != NULL) { - if (isWndLocal && !IsWindow( hWnd )) + if (isWndLocal && !IsWindow(hWnd)) break; + ei.hEvent = hDbEvent; if (GetEventData(ei, data)) { if (noFilter || CanShowHistory(&gdbei)) { @@ -208,7 +209,7 @@ void EventList::GetTempList(std::list& tempList, bool noFilter, tempList.push_back(ti); } } - hDbEvent = db_event_next(hDbEvent); + hDbEvent = db_event_next(_hContact, hDbEvent); } if (!noExt) { diff --git a/plugins/BasicHistory/src/HistoryWindow.cpp b/plugins/BasicHistory/src/HistoryWindow.cpp index 4236372df8..cceb8098a7 100644 --- a/plugins/BasicHistory/src/HistoryWindow.cpp +++ b/plugins/BasicHistory/src/HistoryWindow.cpp @@ -477,7 +477,7 @@ INT_PTR HistoryWindow::DeleteAllUserHistory(WPARAM hContact, LPARAM) CallService(MS_DB_SETSAFETYMODE, FALSE, 0); HANDLE hDbEvent = db_event_last(hContact); while (hDbEvent != NULL) { - HANDLE hPrevEvent = db_event_prev(hDbEvent); + HANDLE hPrevEvent = db_event_prev(hContact, hDbEvent); hDbEvent = ( db_event_delete(hContact, hDbEvent) == 0) ? hPrevEvent : NULL; } CallService(MS_DB_SETSAFETYMODE, TRUE, 0); -- cgit v1.2.3