From 86fbd3af4c73f576da7b55c5cea71c54046a1c90 Mon Sep 17 00:00:00 2001 From: boisso Date: Mon, 16 Feb 2015 22:40:00 +0000 Subject: [PATCH] Fix tooltip more options --- k-meleon/ToolBarEx.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/k-meleon/ToolBarEx.cpp b/k-meleon/ToolBarEx.cpp index cfb06649..77baf45f 100644 --- a/k-meleon/ToolBarEx.cpp +++ b/k-meleon/ToolBarEx.cpp @@ -241,19 +241,18 @@ BOOL CToolBarEx::OnTbnGetDispInfo(UINT, NMHDR * pNotifyStruct, LRESULT* pResult) if (button->mTooltip.GetLength()) { pTTT->lpszText = (LPTSTR)theApp.lang.Translate(button->mTooltip); } - else if (text.LoadString(pNotifyStruct->idFrom)) { + else { + if (!text.LoadString(pNotifyStruct->idFrom)) { + KmCommand cmd; + text = theApp.commands.GetDescription(button->mAction); + if (!text.GetLength()) return FALSE; + } if (button->mMenuName) { text += L"\n"; text.AppendFormat(IDS_MORE_OPTIONS); } pTTT->lpszText = text.GetBuffer(); } - else { - KmCommand cmd; - text = theApp.commands.GetDescription(button->mAction); - if (!text.GetLength()) return FALSE; - pTTT->lpszText = text.GetBuffer(); - } return TRUE; }