[vlc-devel] commit: Qt: don't fire the Conflict dialog for "Unset" Keys ( Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat May  2 23:43:46 2009 +0200| [9c95e9337eb71c63b65d75991ba6aeec0fed5bfc] | committer: Jean-Baptiste Kempf 

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9c95e9337eb71c63b65d75991ba6aeec0fed5bfc
---

 modules/gui/qt4/components/preferences_widgets.cpp |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 47c61a7..9996339 100644
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -1345,7 +1345,9 @@ void KeyInputDialog::checkForConflicts( int i_vlckey )
      QList<QTreeWidgetItem *> conflictList =
          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(
           qtr("Warning: the key is already assigned to \"") +