From 38cc6ba3c3f5cb41d491df8414b270158152f3da Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 16 Jul 2018 20:05:28 +0300 Subject: fixes #1503 (Clist_blind: Main menu has gone) --- src/mir_app/src/clistcore.cpp | 1 + src/mir_app/src/clui.cpp | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/mir_app/src/clistcore.cpp b/src/mir_app/src/clistcore.cpp index b4a6bc2109..7443758c14 100644 --- a/src/mir_app/src/clistcore.cpp +++ b/src/mir_app/src/clistcore.cpp @@ -59,6 +59,7 @@ static int fnIsVisibleContact(ClcCacheEntry*, ClcGroup*) void InitClistCore() { g_clistApi.menuProtos = &g_menuProtos; + g_clistApi.bOwnerDrawMenu = true; g_clistApi.pfnContactListControlWndProc = fnContactListControlWndProc; diff --git a/src/mir_app/src/clui.cpp b/src/mir_app/src/clui.cpp index 6166d78832..4079bdc675 100644 --- a/src/mir_app/src/clui.cpp +++ b/src/mir_app/src/clui.cpp @@ -99,12 +99,14 @@ static int CluiLangpackChanged(WPARAM, LPARAM) TranslateMenu(g_clistApi.hMenuMain); // make menu bar owner-drawn and set it on - MENUITEMINFO mii; - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_TYPE | MIIM_DATA; - mii.dwItemData = MENU_MIRANDAMENU; - mii.fType = MFT_OWNERDRAW; - SetMenuItemInfo(g_clistApi.hMenuMain, 0, TRUE, &mii); + if (g_clistApi.bOwnerDrawMenu) { + MENUITEMINFO mii; + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_TYPE | MIIM_DATA; + mii.dwItemData = MENU_MIRANDAMENU; + mii.fType = MFT_OWNERDRAW; + SetMenuItemInfo(g_clistApi.hMenuMain, 0, TRUE, &mii); + } if (GetMenu(g_clistApi.hwndContactList)) SetMenu(g_clistApi.hwndContactList, g_clistApi.hMenuMain); -- cgit v1.2.3