[vlc-commits] Qt: hotkeys: always overwrite global hotkeys (fix #7932)

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sat Dec 22 20:59:53 2012 +0100| [9d7bf49bb4ccada00b85d09b23aec242fb7ddbdc] | committer: Francois Cartegnie

Qt: hotkeys: always overwrite global hotkeys (fix #7932)

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

 modules/gui/qt4/components/preferences_widgets.cpp |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 14e7366..ced4394 100644
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -1353,13 +1353,10 @@ void KeySelectorControl::doApply()
             config_PutPsz( p_this,
                            qtu( it->data( ACTION_COL, Qt::UserRole ).toString() ),
                            qtu( it->data( HOTKEY_COL, Qt::UserRole ).toString() ) );
-        if( !it->data( GLOBAL_HOTKEY_COL, Qt::UserRole ).toString().isEmpty() )
-        {
-            config_PutPsz( p_this,
-                           qtu( "global-" + it->data( ACTION_COL, Qt::UserRole ).toString() ),
-                           qtu( it->data( GLOBAL_HOTKEY_COL, Qt::UserRole ).toString() ) );
-        }
 
+        config_PutPsz( p_this,
+                       qtu( "global-" + it->data( ACTION_COL, Qt::UserRole ).toString() ),
+                       qtu( it->data( GLOBAL_HOTKEY_COL, Qt::UserRole ).toString() ) );
     }
 }