From b8c1d91a6b8cd0873d9fefa1c978300e99cfb8a3 Mon Sep 17 00:00:00 2001 From: sje Date: Thu, 1 Feb 2007 10:02:49 +0000 Subject: fix for temp default save logic git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@99 4f64403b-2f21-0410-a795-97e2b3489a10 --- metacontacts/meta_services.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'metacontacts/meta_services.c') diff --git a/metacontacts/meta_services.c b/metacontacts/meta_services.c index e64a27d..e0fd1d3 100644 --- a/metacontacts/meta_services.c +++ b/metacontacts/meta_services.c @@ -1042,11 +1042,13 @@ int Meta_MessageWindowEvent(WPARAM wParam, LPARAM lParam) { MetaAPI_UnforceSendContact((WPARAM)mwed->hContact, 0); // restore saved default contact - saved_def = DBGetContactSettingDword(mwed->hContact, META_PROTO, "SavedDefault", -1); - if(options.temp_default && saved_def != -1) { - DBWriteContactSettingDword(mwed->hContact, META_PROTO, "Default", saved_def); - DBWriteContactSettingDword(mwed->hContact, META_PROTO, "SavedDefault", (DWORD)-1); - NotifyEventHooks(hEventDefaultChanged, (WPARAM)mwed->hContact, (LPARAM)Meta_GetContactHandle(hMeta, saved_def)); // nick set in event handler + if(options.set_default_on_recv) { + saved_def = DBGetContactSettingDword(mwed->hContact, META_PROTO, "SavedDefault", -1); + if(options.temp_default && saved_def != (DWORD)-1) { + DBWriteContactSettingDword(mwed->hContact, META_PROTO, "Default", saved_def); + DBWriteContactSettingDword(mwed->hContact, META_PROTO, "SavedDefault", (DWORD)-1); + NotifyEventHooks(hEventDefaultChanged, (WPARAM)mwed->hContact, (LPARAM)Meta_GetContactHandle(hMeta, saved_def)); // nick set in event handler + } } } } -- cgit v1.2.3