From 9591bca42dfaeecdbcddd9c0986e3a9819abf92c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 15 Mar 2014 18:33:34 +0000 Subject: correct hiding/unhiding of subs when one turns MC on/off git-svn-id: http://svn.miranda-ng.org/main/trunk@8629 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/metacontacts/meta_services.cpp | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) (limited to 'src/modules/metacontacts/meta_services.cpp') diff --git a/src/modules/metacontacts/meta_services.cpp b/src/modules/metacontacts/meta_services.cpp index ad51900526..3ed877f6e6 100644 --- a/src/modules/metacontacts/meta_services.cpp +++ b/src/modules/metacontacts/meta_services.cpp @@ -302,13 +302,6 @@ int Meta_HandleACK(WPARAM wParam, LPARAM lParam) return ProtoBroadcastAck(META_PROTO, cc->contactID, ack->type, ack->result, ack->hProcess, ack->lParam); } -// hiding contacts on "CList/UseGroups" setting changed can cause a crash - do it in a seperate thread during idle time -static DWORD sttHideContacts(BOOL param) -{ - Meta_HideMetaContacts((int)param); - return 0; -} - /** Call whenever a contact changes one of its settings (for example, the status) ** * @param wParam HANDLE to the contact that has change of its setting. @@ -320,17 +313,17 @@ int Meta_SettingChanged(WPARAM hContact, LPARAM lParam) DBCONTACTWRITESETTING *dcws = (DBCONTACTWRITESETTING *)lParam; char buffer[512], szId[40]; - // hide metacontacts when groups disabled - if (hContact == 0) + // the only global options we're interested in + if (hContact == 0) { + // hide metacontacts when groups disabled if ((!strcmp(dcws->szModule, "CList") && !strcmp(dcws->szSetting, "UseGroups")) || - (!strcmp(dcws->szModule, META_PROTO) && !strcmp(dcws->szSetting, "Enabled"))) { - sttHideContacts(!options.bEnabled); - return 0; + (!strcmp(dcws->szModule, META_PROTO) && !strcmp(dcws->szSetting, "Enabled"))) + { + options.bEnabled = !options.bEnabled; + Meta_HideMetaContacts(!options.bEnabled); } - - // from here on, we're just interested in subcontact settings - if (hContact == 0) return 0; + } DBCachedContact *cc = currDb->m_cache->GetCachedContact(hContact); if (cc == NULL || !cc->IsSub()) -- cgit v1.2.3