From 1d9fd398b75a5a6eca9d40db2e2abb60c96ebc7d Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 17 May 2013 19:23:37 +0000 Subject: some more fixes for MS_DB_CONTACT_DELETE & loops git-svn-id: http://svn.miranda-ng.org/main/trunk@4710 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Twitter/src/contacts.cpp | 4 +--- protocols/Twitter/src/proto.cpp | 5 ++++- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'protocols/Twitter/src') diff --git a/protocols/Twitter/src/contacts.cpp b/protocols/Twitter/src/contacts.cpp index 3d4d7f9d58..f5568c9a9a 100644 --- a/protocols/Twitter/src/contacts.cpp +++ b/protocols/Twitter/src/contacts.cpp @@ -272,11 +272,9 @@ HANDLE TwitterProto::AddToClientList(const char *name,const char *status) db_free(&dbv); } - return hContact; } - else - CallService(MS_DB_CONTACT_DELETE,(WPARAM)hContact,0); + CallService(MS_DB_CONTACT_DELETE,(WPARAM)hContact,0); } return 0; diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp index 5a1aa801f6..deeb0f88c7 100644 --- a/protocols/Twitter/src/proto.cpp +++ b/protocols/Twitter/src/proto.cpp @@ -503,9 +503,12 @@ void TwitterProto::UpdateSettings() if(in_chat_) OnLeaveChat(0,0); - for(HANDLE hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) + for(HANDLE hContact = db_find_first(m_szModuleName); hContact; ) { + HANDLE hNext = db_find_next(hContact, m_szModuleName); if(db_get_b(hContact,m_szModuleName,"ChatRoom",0)) CallService(MS_DB_CONTACT_DELETE,reinterpret_cast(hContact),0); + hContact = hNext; + } } } -- cgit v1.2.3