From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Sat, 8 Sep 2007 02:29:44 +0000 (+0000)
Subject: QT4: fix warning on already assigned hotkey
X-Git-Tag: 0.9.0-test0~5788
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=5dfdcf24ef3359b29571302fe73843bf42b3a0bc;p=vlc

QT4: fix warning on already assigned hotkey
Patch by  Hannes Domani
---

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 5d2019411a..b03a010a96 100644
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -998,6 +998,8 @@ void KeySelectorControl::selectKey( QTreeWidgetItem *keyItem )
                 QTreeWidgetItem *it = table->topLevelItem(i);
                 module_config_t *p_item = static_cast<module_config_t*>
                               (it->data( 0, Qt::UserRole ).value<void*>());
+                if( p_keyItem != p_item && p_item->value.i == d->keyValue )
+                    p_item->value.i = 0;
                 it->setText( 1, VLCKeyToString( p_item->value.i ) );
             }
         }
@@ -1052,7 +1054,6 @@ void KeyInputDialog::checkForConflicts( int i_vlckey )
         if( p_current->value.i == i_vlckey && strcmp( p_current->psz_text,
                                                     keyToChange ) )
         {
-            p_current->value.i = 0;
             conflicts = true;
             break;
         }