From ae8b4b8188bff1e249f1fa6ab3ac41afb4420413 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Wed, 16 Nov 2011 22:43:58 +0100 Subject: [PATCH] Qt: preferences, fix conflict detection. Should close #3823 and #5052 --- modules/gui/qt4/components/preferences_widgets.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp index f26faf3a8e..f9cf579c1f 100644 --- a/modules/gui/qt4/components/preferences_widgets.cpp +++ b/modules/gui/qt4/components/preferences_widgets.cpp @@ -1545,16 +1545,16 @@ KeyInputDialog::KeyInputDialog( QTreeWidget *_table, void KeyInputDialog::checkForConflicts( int i_vlckey ) { - QList conflictList = - table->findItems( VLCKeyToString( i_vlckey ), Qt::MatchExactly, - b_global ? 2 : 1 ); + QList conflictList = + table->findItems( VLCKeyToString( i_vlckey ), Qt::MatchExactly, + b_global ? 2 : 1 ); if( conflictList.count() && - conflictList[0]->data( b_global ? 2 : 1, Qt::UserRole ).toInt() > 1 ) - /* Avoid 0 or -1 that are the "Unset" states */ + !conflictList[0]->data( b_global ? 2 : 1, Qt::UserRole ).toString().isEmpty() && + conflictList[0]->data( b_global ? 2 : 1, Qt::UserRole ).toString() != "Unset" ) { warning->setText( qtr("Warning: the key is already assigned to \"") + - conflictList[0]->text( 0 ) + "\"" ); + conflictList[0]->text( 0 ) + "\"" ); warning->show(); buttonBox->show(); -- 2.39.5