diff options
-rw-r--r-- | plugins/TopToolBar/src/common.h | 2 | ||||
-rw-r--r-- | plugins/TopToolBar/src/toolbar.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/plugins/TopToolBar/src/common.h b/plugins/TopToolBar/src/common.h index 865a9a2c4a..105954726e 100644 --- a/plugins/TopToolBar/src/common.h +++ b/plugins/TopToolBar/src/common.h @@ -106,7 +106,7 @@ extern TTBCtrl* g_ctrl; extern LIST<TopButtonInt> Buttons;
extern HINSTANCE hInst;
extern HBITMAP hBmpBackground, hBmpSeparator;
-extern CRITICAL_SECTION csButtonsHook;
+extern mir_cs csButtonsHook;
extern pfnCustomProc g_CustomProc;
extern LPARAM g_CustomProcParam;
extern HANDLE hTTBModuleLoaded;
diff --git a/plugins/TopToolBar/src/toolbar.cpp b/plugins/TopToolBar/src/toolbar.cpp index a7d88e3d0e..6e2d173092 100644 --- a/plugins/TopToolBar/src/toolbar.cpp +++ b/plugins/TopToolBar/src/toolbar.cpp @@ -16,7 +16,7 @@ int nextButtonId = 200; HANDLE hTTBModuleLoaded;
static WNDPROC buttonWndProc;
-CRITICAL_SECTION csButtonsHook;
+mir_cs csButtonsHook;
int sortfunc(const TopButtonInt *a, const TopButtonInt *b)
{
@@ -656,7 +656,6 @@ int LoadToolbarModule() db_unset(NULL, TTB_OPTDIR, "WarningDone");
- InitializeCriticalSection(&csButtonsHook);
hBmpSeparator = LoadBitmap(hInst, MAKEINTRESOURCE(IDB_SEP));
HookEvent(ME_SYSTEM_MODULELOAD, OnPluginLoad);
@@ -702,7 +701,6 @@ int UnloadToolbarModule() DestroyHookableEvent(hTTBModuleLoaded);
DeleteObject(hBmpSeparator);
- DeleteCriticalSection(&csButtonsHook);
for (int i = 0; i < Buttons.getCount(); i++)
delete Buttons[i];
|