MenuEx_ampersand_fix.patch

Index: src/apps/mplayerc/controls/MenuEx.cpp
===================================================================
--- src/apps/mplayerc/controls/MenuEx.cpp   (revision 4819)
+++ src/apps/mplayerc/controls/MenuEx.cpp   (working copy)
@@ -237,9 +237,14 @@
    CString strR;
    CString str = lpItem->strText;
    if (bNoAccel) {
-       str.Replace(L"&&", L"{{amp}}");
-       str.Remove(L'&');
-       str.Replace(L"{{amp}}", L"&&");
+       int pos = 0;
+       while ((pos = str.Find('&', pos)) >= 0) {
+           if (str.GetAt(pos + 1) != '&') {
+               str.SetAt(pos, 0x16);
+           }
+           pos += 2;
+       }
+       str.Remove(0x16);
    }
    const int pos = str.Find('\t');
    if (pos > 0) {