diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-09-23 15:15:34 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-09-23 15:15:34 +0000 |
| commit | 37402dbb06f667f08e8d62f0c27de85c01c08669 (patch) | |
| tree | d42965f6d830d271acb5184ae83357486ce2a5fe /plugins/Popup/src/services.cpp | |
| parent | b96e8b57b130d567507cb2bb2cc993e32badb4bb (diff) | |
fix for a random crash
git-svn-id: http://svn.miranda-ng.org/main/trunk@1634 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Popup/src/services.cpp')
| -rw-r--r-- | plugins/Popup/src/services.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/plugins/Popup/src/services.cpp b/plugins/Popup/src/services.cpp index 3246a2fbcd..00d268d9ab 100644 --- a/plugins/Popup/src/services.cpp +++ b/plugins/Popup/src/services.cpp @@ -71,7 +71,7 @@ static bool isFullScreen() // check foregroundwindow
HWND hWnd = GetForegroundWindow();
- if (hWnd && hWnd != hWndDesktop && hWnd != hWndShell)
+ if (hWnd && hWnd != hWndDesktop && hWnd != hWndShell)
{
TCHAR tszClassName[128] = _T("");
GetClassName(hWnd, tszClassName, SIZEOF(tszClassName));
@@ -83,8 +83,8 @@ static bool isFullScreen() GetClientRect(hWnd, &rect);
ClientToScreen(hWnd, (LPPOINT)&rect);
ClientToScreen(hWnd, (LPPOINT)&rect.right);
-
- if (EqualRect(&rect, &rectw) && IntersectRect(&recti, &rect, &rcScreen) &&
+
+ if (EqualRect(&rect, &rectw) && IntersectRect(&recti, &rect, &rcScreen) &&
EqualRect(&recti, &rcScreen))
return true;
}
@@ -189,10 +189,10 @@ INT_PTR PopUp_AddPopUpW(WPARAM wParam, LPARAM lParam) ppd2.PluginWindowProc = ppd->PluginWindowProc;
ppd2.PluginData = ppd->PluginData;
ppd2.iSeconds = ppd->iSeconds;
- ppd2.lchNotification = ppd->hNotification;
if (lParam&APF_NEWDATA)
{
+ ppd2.lchNotification = ppd->hNotification;
ppd2.actionCount = ppd->actionCount;
ppd2.lpActions = ppd->lpActions;
// ppd2.hbmAvatar = ppd->hbmAvatar;
@@ -667,9 +667,8 @@ INT_PTR PopUp_CreateClassPopup(WPARAM wParam, LPARAM lParam) { }
ppd2.lchContact = pdc->hContact;
ppd2.PluginData = pdc->PluginData;
-
+
ret = PopUp_AddPopUp2((WPARAM)&ppd2, 0);
}
return ret!=0 ? 1 : 0;
}
-
|