Skip to content

V
vlc-gpu
Commit 9c95e933 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Qt: don't fire the Conflict dialog for "Unset" Keys

parent d9271cf6
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
modules/gui/qt4/components/preferences_widgets.cpp
View file @ 9c95e933
...@@ -1345,7 +1345,9 @@ void KeyInputDialog::checkForConflicts( int i_vlckey ) ...@@ -1345,7 +1345,9 @@ void KeyInputDialog::checkForConflicts( int i_vlckey )
QList<QTreeWidgetItem *> conflictList = QList<QTreeWidgetItem *> conflictList =
table->findItems( VLCKeyToString( i_vlckey ), Qt::MatchExactly, 1 ); table->findItems( VLCKeyToString( i_vlckey ), Qt::MatchExactly, 1 );
if( conflictList.size() ) if( conflictList.size() &&
conflictList[0]->data( 1, Qt::UserRole ).toInt() > 1 )
/* Avoid 0 or -1 that are the "Unset" states*/
{ {
QLabel *warning = new QLabel( QLabel *warning = new QLabel(
qtr("Warning: the key is already assigned to \"") + qtr("Warning: the key is already assigned to \"") +
......
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