summaryrefslogtreecommitdiff
path: root/plugins/TopToolBar/src
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-11-04 23:15:51 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-11-04 23:15:51 +0000
commit1c0f4afc353a295e01af1584432d3d588d5721dc (patch)
treea7541a5a077e033c2f2037c780fad14c5b943037 /plugins/TopToolBar/src
parent25a50eb1004a71cf5a56b1fc8d6b538bf21a8f71 (diff)
andalso remove frame, if present
git-svn-id: http://svn.miranda-ng.org/main/trunk@2203 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/TopToolBar/src')
-rw-r--r--plugins/TopToolBar/src/toolbar.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/plugins/TopToolBar/src/toolbar.cpp b/plugins/TopToolBar/src/toolbar.cpp
index ba97fe87fe..24d8076b7f 100644
--- a/plugins/TopToolBar/src/toolbar.cpp
+++ b/plugins/TopToolBar/src/toolbar.cpp
@@ -617,9 +617,15 @@ static int OnModulesLoad(WPARAM wParam, LPARAM lParam)
static int OnShutdown(WPARAM wParam, LPARAM lParam)
{
- if (g_ctrl && g_ctrl->hWnd) {
- DestroyWindow(g_ctrl->hWnd);
- g_ctrl->hWnd = NULL;
+ if (g_ctrl) {
+ if (g_ctrl->hFrame) {
+ CallService(MS_CLIST_FRAMES_REMOVEFRAME, (WPARAM)g_ctrl->hFrame, 0);
+ g_ctrl->hFrame = 0;
+ }
+ else if (g_ctrl->hWnd) {
+ DestroyWindow(g_ctrl->hWnd);
+ g_ctrl->hWnd = NULL;
+ }
}
return 0;