diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-02-20 16:03:04 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-02-20 16:03:04 +0000 |
| commit | d7b15f5f89319f1a9077efb50bd3a242a5dc2b52 (patch) | |
| tree | a28c1bfd2a40556cb61f95ec67e1d9aabeb82cd5 /plugins/Popup/src/services.cpp | |
| parent | 5c7ba495c74de2d7342ad05c59632b43c1d5321f (diff) | |
fixes for various hangups & crashes on exit
git-svn-id: http://svn.miranda-ng.org/main/trunk@3652 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Popup/src/services.cpp')
| -rw-r--r-- | plugins/Popup/src/services.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/plugins/Popup/src/services.cpp b/plugins/Popup/src/services.cpp index a068575af2..858f990aae 100644 --- a/plugins/Popup/src/services.cpp +++ b/plugins/Popup/src/services.cpp @@ -416,7 +416,7 @@ INT_PTR PopUp_Change2(WPARAM wParam, LPARAM lParam) //===== PopUp/ShowMessage
INT_PTR PopUp_ShowMessage(WPARAM wParam, LPARAM lParam) {
if (!gbPopupLoaded || !wParam || !lParam) return -1;
- if(closing) return 0;
+ if (closing) return 0;
POPUPDATA2 ppd2 = {0};
ppd2.cbSize = sizeof(ppd2);
@@ -452,7 +452,7 @@ INT_PTR PopUp_ShowMessage(WPARAM wParam, LPARAM lParam) { INT_PTR PopUp_ShowMessageW(WPARAM wParam, LPARAM lParam) {
if (!gbPopupLoaded || !wParam || !lParam) return -1;
- if(closing) return 0;
+ if (closing) return 0;
POPUPDATA2 ppd2 = {0};
ppd2.cbSize = sizeof(ppd2);
@@ -577,7 +577,7 @@ INT_PTR PopUp_RegisterPopupClass(WPARAM wParam, LPARAM lParam) { memcpy(&ptd->pupClass, pc, sizeof(POPUPCLASS));
ptd->pszTreeRoot = mir_a2t(pc->pszName);
ptd->pupClass.pszName = mir_strdup(pc->pszName);
- if(pc->flags & PCF_UNICODE) {
+ if (pc->flags & PCF_UNICODE) {
ptd->pupClass.pwszDescription = mir_wstrdup(pc->pwszDescription);
ptd->pszDescription = mir_u2t(pc->pwszDescription);
}
@@ -627,18 +627,18 @@ INT_PTR PopUp_RegisterPopupClass(WPARAM wParam, LPARAM lParam) { INT_PTR PopUp_CreateClassPopup(WPARAM wParam, LPARAM lParam) {
int ret = 1;
POPUPDATACLASS *pdc = (POPUPDATACLASS *)lParam;
- if(pdc->cbSize != sizeof(POPUPDATACLASS)) return ret;
+ if (pdc->cbSize != sizeof(POPUPDATACLASS)) return ret;
POPUPCLASS *pc = NULL;
POPUPTREEDATA *ptd = NULL;
- if(wParam) pc = (POPUPCLASS *)wParam;
+ if (wParam) pc = (POPUPCLASS *)wParam;
else {
LPTSTR group = mir_a2t(pdc->pszClassName);
ptd = (POPUPTREEDATA *)FindTreeData(group, NULL, 2);
- if(ptd) pc = &ptd->pupClass;
+ if (ptd) pc = &ptd->pupClass;
}
- if(pc) {
+ if (pc) {
POPUPDATA2 ppd2 = {0};
ppd2.cbSize = sizeof(POPUPDATA2);
ppd2.colorBack = pc->colorBack;
@@ -646,7 +646,7 @@ INT_PTR PopUp_CreateClassPopup(WPARAM wParam, LPARAM lParam) { ppd2.lchIcon = pc->hIcon;
ppd2.iSeconds = pc->iSeconds;
ppd2.PluginWindowProc = pc->PluginWindowProc;
- if(pc->flags & PCF_UNICODE) {
+ if (pc->flags & PCF_UNICODE) {
ppd2.flags = PU2_UNICODE;
ppd2.lpwzTitle = (WCHAR*)pdc->pwszTitle;
ppd2.lpwzText = (WCHAR*)pdc->pwszText;
|