From bb0fa93f4a6425e5d78a8d1388f35edc152744a8 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 12 Jul 2012 20:12:37 +0000 Subject: ok, this is war: all invalid icons are simply rejected git-svn-id: http://svn.miranda-ng.org/main/trunk@932 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TopToolBar/toolbar.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'plugins/TopToolBar/toolbar.cpp') diff --git a/plugins/TopToolBar/toolbar.cpp b/plugins/TopToolBar/toolbar.cpp index bbb4ee5932..976774acd9 100644 --- a/plugins/TopToolBar/toolbar.cpp +++ b/plugins/TopToolBar/toolbar.cpp @@ -296,22 +296,22 @@ INT_PTR TTBAddButton(WPARAM wParam, LPARAM lParam) if (wParam == 0) return -1; - TopButtonInt* b; - { - mir_cslock lck(csButtonsHook); - - TTBButton *but = (TTBButton*)wParam; - if (but->cbSize != sizeof(TTBButton) && but->cbSize != OLD_TBBUTTON_SIZE) - return -1; + TTBButton *but = (TTBButton*)wParam; + if (but->cbSize != sizeof(TTBButton) && but->cbSize != OLD_TBBUTTON_SIZE) + return -1; - if ( !(but->dwFlags && TTBBF_ISLBUTTON) && nameexists(but->name)) - return -1; + if ( !(but->dwFlags && TTBBF_ISLBUTTON) && nameexists(but->name)) + return -1; - b = CreateButton(but); - b->hLangpack = (int)lParam; - b->LoadSettings(); + TopButtonInt* b = CreateButton(but); + b->hLangpack = (int)lParam; + b->LoadSettings(); + b->CreateWnd(); + if (b->hwnd == NULL) + return -1; + { + mir_cslock lck(csButtonsHook); Buttons.insert(b); - b->CreateWnd(); } g_ctrl->bOrderChanged = TRUE; -- cgit v1.2.3