summaryrefslogtreecommitdiff
path: root/protocols/Skype/src/skype_utils.cpp
diff options
context:
space:
mode:
authorAlexander Lantsev <aunsane@gmail.com>2013-06-10 10:42:46 +0000
committerAlexander Lantsev <aunsane@gmail.com>2013-06-10 10:42:46 +0000
commitef6701c0f1f29970a54a1a1e0219a1b5bbeb4984 (patch)
tree47936978d0385f84771eae9aed4d6a7a5a02f36d /protocols/Skype/src/skype_utils.cpp
parentdf428745363d5b3d22f2a737930ca0e7af8e2221 (diff)
Skype:
- proto goes offline on disconnect - fixed notifications git-svn-id: http://svn.miranda-ng.org/main/trunk@4907 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Skype/src/skype_utils.cpp')
-rw-r--r--protocols/Skype/src/skype_utils.cpp10
1 files changed, 6 insertions, 4 deletions
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)