diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-11-04 23:26:08 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-11-04 23:26:08 +0000 |
| commit | 59e4f9335276f10bfa6dd9874bff457405e079ed (patch) | |
| tree | b6ff25a5fc4eacb33b5c2bfcfda581f209a4e561 | |
| parent | 1c0f4afc353a295e01af1584432d3d588d5721dc (diff) | |
more clear exit from TTB
git-svn-id: http://svn.miranda-ng.org/main/trunk@2204 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/TopToolBar/src/toolbar.cpp | 2 | ||||
| -rw-r--r-- | plugins/TopToolBar/src/toolbarwnd.cpp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/plugins/TopToolBar/src/toolbar.cpp b/plugins/TopToolBar/src/toolbar.cpp index 24d8076b7f..1167763997 100644 --- a/plugins/TopToolBar/src/toolbar.cpp +++ b/plugins/TopToolBar/src/toolbar.cpp @@ -622,7 +622,7 @@ static int OnShutdown(WPARAM wParam, LPARAM lParam) CallService(MS_CLIST_FRAMES_REMOVEFRAME, (WPARAM)g_ctrl->hFrame, 0);
g_ctrl->hFrame = 0;
}
- else if (g_ctrl->hWnd) {
+ if (g_ctrl->hWnd) {
DestroyWindow(g_ctrl->hWnd);
g_ctrl->hWnd = NULL;
}
diff --git a/plugins/TopToolBar/src/toolbarwnd.cpp b/plugins/TopToolBar/src/toolbarwnd.cpp index e3f19f693b..0541975bf3 100644 --- a/plugins/TopToolBar/src/toolbarwnd.cpp +++ b/plugins/TopToolBar/src/toolbarwnd.cpp @@ -127,6 +127,10 @@ LRESULT CALLBACK TopToolBarProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara PostMessage(hwnd, TTB_UPDATEFRAMEVISIBILITY, 1, 0);
return FALSE;
+ case WM_DESTROY:
+ g_ctrl->hWnd = NULL;
+ break;
+
case WM_MOVE:
return 0;
@@ -247,7 +251,7 @@ LRESULT CALLBACK TopToolBarProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara default:
return DefWindowProc(hwnd, msg, wParam, lParam);
}
- return(TRUE);
+ return TRUE;
}
/////////////////////////////////////////////////////////////////////////////////////////
|