simple database event cycles moved to cursors

1 files changed, 4 insertions, 8 deletions

diff --git a/plugins/RemovePersonalSettings/src/rps.cpp b/plugins/RemovePersonalSettings/src/rps.cpp
index 4b274a6a9a..91a1c56cd8 100644
--- a/plugins/RemovePersonalSettings/src/rps.cpp
+++ b/plugins/RemovePersonalSettings/src/rps.cpp
@@ -363,17 +363,13 @@ void RemoveUsers()
 		hContact = db_find_first();

 		while (hContact != NULL) {

 			db_delete_contact(hContact);

-

 			hContact = db_find_first();

 		}

 

-		// Delete events for contacts not in list

-		MEVENT hDbEvent = db_event_first(0);

-

-		while (hDbEvent != NULL) {

-			db_event_delete(hDbEvent);

-			hDbEvent = db_event_first(0);

-		}

+		// Delete events from system history

+		DB::ECPTR pCursor(DB::Events(0));

+		while (pCursor.FetchNext())

+			pCursor.DeleteEvent();

 

 		// Now delete groups

 		DeleteSettingEx("CListGroups", nullptr);