vlc/vlc-2.1 | branch: master | Ludovic Fauvet <[email protected]> | Thu Jul 11 
16:53:53 2013 +0200| [4f551c67666ec6a99007ae5903089d8bf0dbf255] | committer: 
Jean-Baptiste Kempf

Qt: recents: don't create an accelerator for MRL containing '&'

(cherry picked from commit 3867805b39ae961bda3678e9f3515c01476361cb)
Signed-off-by: Jean-Baptiste Kempf <[email protected]>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=4f551c67666ec6a99007ae5903089d8bf0dbf255
---

 modules/gui/qt4/menus.cpp |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index f9d5e85..3a18923 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -1601,6 +1601,8 @@ void VLCMenuBar::updateRecents( intf_thread_t *p_intf )
                 char *psz = decode_URI_duplicate( qtu( mrl ) );
                 QString text = qfu( psz );
 
+                text.replace("&", "&&");
+
                 free( psz );
                 action = recentsMenu->addAction(
                         QString( i < 9 ? "&%1: ": "%1: " ).arg( i + 1 ) +

_______________________________________________
vlc-commits mailing list
[email protected]
http://mailman.videolan.org/listinfo/vlc-commits

Reply via email to