Win32GUI: Prevent ampersand-escaped mnemonics in menus

diff --git a/win/win32/mhmenu.c b/win/win32/mhmenu.c
index 9d9e17a1f1ad0b689323aa9492dcf023f2d82a68..bbf364cd4cd3b9ceae92df52765adb89f0357637 100644 (file)
--- a/win/win32/mhmenu.c
+++ b/win/win32/mhmenu.c
@@ -603,6 +603,8 @@ onMSNHCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
         data->menu.items[new_item].attr = msg_data->attr;
         strncpy(data->menu.items[new_item].str, msg_data->str,
                 NHMENU_STR_SIZE);
+       /* prevent & being interpreted as a mnemonic start */
+        strNsubst(data->menu.items[new_item].str, "&", "&&", 0);
         data->menu.items[new_item].presel = msg_data->presel;
 
         /* calculate tabstop size */