Fix tooltip more options

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;
 }