From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Thu, 17 Jan 2008 08:40:17 +0000 (+0000)
Subject: Qt4 - Hotkeys: fix the bug about modifiers that empeached you to have modifiers ... 
X-Git-Tag: 0.9.0-test0~3416
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=03a9b9cb7b38ce441fe9c6d30885a650cff9cf4b;p=vlc

Qt4 - Hotkeys: fix the bug about modifiers that empeached you to have modifiers + key.
---

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 0889e4670f..3a3675062e 100644
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -1204,7 +1204,8 @@ void KeyInputDialog::checkForConflicts( int i_vlckey )
 
 void KeyInputDialog::keyPressEvent( QKeyEvent *e )
 {
-    if( e->key() == Qt::Key_Tab ) return;
+    if( e->key() == Qt::Key_Tab ||
+        ( e->modifiers() > 0 && e->modifiers() != Qt::KeypadModifier ) ) return;
     int i_vlck = qtEventToVLCKey( e );
     selected->setText( qtr( "Key: " ) + VLCKeyToString( i_vlck ) );
     checkForConflicts( i_vlck );