diff options
Diffstat (limited to 'plugins/BasicHistory/src')
| -rw-r--r-- | plugins/BasicHistory/src/EventList.cpp | 5 | ||||
| -rw-r--r-- | plugins/BasicHistory/src/HistoryWindow.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
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<EventTempIndex>& 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<EventTempIndex>& 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);
|