Commit 03a9b9cb authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

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

parent e512b8bd
...@@ -1204,7 +1204,8 @@ void KeyInputDialog::checkForConflicts( int i_vlckey ) ...@@ -1204,7 +1204,8 @@ void KeyInputDialog::checkForConflicts( int i_vlckey )
void KeyInputDialog::keyPressEvent( QKeyEvent *e ) 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 ); int i_vlck = qtEventToVLCKey( e );
selected->setText( qtr( "Key: " ) + VLCKeyToString( i_vlck ) ); selected->setText( qtr( "Key: " ) + VLCKeyToString( i_vlck ) );
checkForConflicts( i_vlck ); checkForConflicts( i_vlck );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment