Skip to content

V
vlc-2-2
Commit 9d7bf49b authored by Francois Cartegnie's avatar Francois Cartegnie
Browse files
Options

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

parent 28d465e8
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 6 deletions
modules/gui/qt4/components/preferences_widgets.cpp
View file @ 9d7bf49b
...@@ -1353,14 +1353,11 @@ void KeySelectorControl::doApply() ...@@ -1353,14 +1353,11 @@ void KeySelectorControl::doApply()
config_PutPsz( p_this, config_PutPsz( p_this,
qtu( it->data( ACTION_COL, Qt::UserRole ).toString() ), qtu( it->data( ACTION_COL, Qt::UserRole ).toString() ),
qtu( it->data( HOTKEY_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, config_PutPsz( p_this,
qtu( "global-" + it->data( ACTION_COL, Qt::UserRole ).toString() ), qtu( "global-" + it->data( ACTION_COL, Qt::UserRole ).toString() ),
qtu( it->data( GLOBAL_HOTKEY_COL, Qt::UserRole ).toString() ) ); qtu( it->data( GLOBAL_HOTKEY_COL, Qt::UserRole ).toString() ) );
} }
}
} }
bool KeySelectorControl::eventFilter( QObject *obj, QEvent *e ) bool KeySelectorControl::eventFilter( QObject *obj, QEvent *e )
......
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