From 1c0f4afc353a295e01af1584432d3d588d5721dc Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 4 Nov 2012 23:15:51 +0000 Subject: andalso remove frame, if present git-svn-id: http://svn.miranda-ng.org/main/trunk@2203 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TopToolBar/src/toolbar.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'plugins') 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; -- cgit v1.2.3