From ef6701c0f1f29970a54a1a1e0219a1b5bbeb4984 Mon Sep 17 00:00:00 2001 From: Alexander Lantsev Date: Mon, 10 Jun 2013 10:42:46 +0000 Subject: Skype: - proto goes offline on disconnect - fixed notifications git-svn-id: http://svn.miranda-ng.org/main/trunk@4907 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Skype/src/skype_utils.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'protocols/Skype/src/skype_utils.cpp') diff --git a/protocols/Skype/src/skype_utils.cpp b/protocols/Skype/src/skype_utils.cpp index fbb5fb5f02..b1829d058c 100644 --- a/protocols/Skype/src/skype_utils.cpp +++ b/protocols/Skype/src/skype_utils.cpp @@ -368,9 +368,7 @@ void CSkypeProto::ShowNotification(const wchar_t *caption, const wchar_t *messag { if (::Miranda_Terminated()) return; - if ( !::ServiceExists(MS_POPUP_ADDPOPUPT) || !::db_get_b(NULL, "Popup", "ModuleIsEnabled", 1)) - ::MessageBoxW(NULL, message, caption, MB_OK | flags); - else + if ( ::ServiceExists(MS_POPUP_ADDPOPUPT) && ::db_get_b(NULL, "Popup", "ModuleIsEnabled", 1)) { POPUPDATAW ppd = {0}; ppd.lchContact = hContact; @@ -381,8 +379,12 @@ void CSkypeProto::ShowNotification(const wchar_t *caption, const wchar_t *messag ::wcsncpy(ppd.lpwzText, message, MAX_SECONDLINE); ppd.lchIcon = ::Skin_GetIcon("Skype_main"); - PUAddPopupW(&ppd); + if ( !PUAddPopupW(&ppd)) + return; + } + + ::MessageBoxW(NULL, message, caption, MB_OK | flags); } void CSkypeProto::ShowNotification(const wchar_t *message, int flags, HANDLE hContact) -- cgit v1.2.3