summaryrefslogtreecommitdiff
path: root/plugins/TabSRMM/src/msgoptions.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2014-01-19 10:50:55 +0000
committerGeorge Hazan <george.hazan@gmail.com>2014-01-19 10:50:55 +0000
commit18f47c388bfc624918358517246d1756ed340ef3 (patch)
tree638d07017405781c1989ab54b8fd416e0abcb8bf /plugins/TabSRMM/src/msgoptions.cpp
parenta7eaae2cf935a1b4037d57d912f683d40bd65fc5 (diff)
fix for deadlock on messages in tabSRMM
git-svn-id: http://svn.miranda-ng.org/main/trunk@7749 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/TabSRMM/src/msgoptions.cpp')
-rw-r--r--plugins/TabSRMM/src/msgoptions.cpp17
1 files changed, 4 insertions, 13 deletions
diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp
index 2e97d7a33f..b136c44603 100644
--- a/plugins/TabSRMM/src/msgoptions.cpp
+++ b/plugins/TabSRMM/src/msgoptions.cpp
@@ -354,18 +354,10 @@ static INT_PTR CALLBACK DlgProcSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
CallService(MS_UTILS_OPENURL, 1, (LPARAM)"http://wiki.miranda.or.at/TabSRMM/UsingSkins");
break;
- case IDC_SKIN_CLOSENOW: {
- BOOL fOldHideSetting = PluginConfig.m_HideOnClose;
-
- PluginConfig.m_HideOnClose = FALSE;
-
- while(pFirstContainer)
- if (pFirstContainer->hwnd)
- SendMessage(pFirstContainer->hwnd, WM_CLOSE, 0, 1);
-
- PluginConfig.m_HideOnClose = fOldHideSetting;
+ case IDC_SKIN_CLOSENOW:
+ CloseAllContainers();
break;
- }
+
case IDC_SKINNAME: {
if (HIWORD(wParam) == CBN_SELCHANGE) {
LRESULT lr = SendDlgItemMessage(hwndDlg, IDC_SKINNAME, CB_GETCURSEL, 0 ,0);
@@ -385,8 +377,7 @@ static INT_PTR CALLBACK DlgProcSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
break;
}
}
- if ((LOWORD(wParam) == IDC_SKINNAME)
- && (HIWORD(wParam) != CBN_SELCHANGE || (HWND) lParam != GetFocus()))
+ if ((LOWORD(wParam) == IDC_SKINNAME) && (HIWORD(wParam) != CBN_SELCHANGE || (HWND) lParam != GetFocus()))
return 0;
SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
break;