Skip to content

V
vlc
Commit b9b3d4e0 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Qt4: fix matching key config items 

mux-ts-use-key-frames is not a key!
parent 7e44b4e1
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
modules/gui/qt4/components/complete_preferences.cpp
View file @ b9b3d4e0
...@@ -457,12 +457,12 @@ AdvPrefsPanel::AdvPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -457,12 +457,12 @@ AdvPrefsPanel::AdvPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
boxlayout = new QGridLayout(); boxlayout = new QGridLayout();
} }
/* Only one hotkey control */ /* Only one hotkey control */
if( has_hotkey && p_item->i_type & CONFIG_ITEM && p_item->psz_name && if( (p_item->i_type & CONFIG_ITEM) == CONFIG_ITEM_KEY )
strstr( p_item->psz_name, "key-" ) ) {
continue; if( has_hotkey )
if( p_item->i_type & CONFIG_ITEM && p_item->psz_name && continue;
strstr( p_item->psz_name, "key-" ) )
has_hotkey = true; has_hotkey = true;
}
ConfigControl *control; ConfigControl *control;
if( ! box ) if( ! box )
......
modules/gui/qt4/components/preferences_widgets.cpp
View file @ b9b3d4e0
...@@ -1295,11 +1295,11 @@ void KeySelectorControl::finish() ...@@ -1295,11 +1295,11 @@ void KeySelectorControl::finish()
{ {
module_config_t *p_item = p_config + i; module_config_t *p_item = p_config + i;
/* If we are a key option not empty */ /* If we are a (non-global) key option not empty */
if( p_item->i_type & CONFIG_ITEM && p_item->psz_name if( (p_item->i_type & CONFIG_ITEM == CONFIG_ITEM_KEY) &&
&& strstr( p_item->psz_name , "key-" ) p_item->psz_name != NULL &&
&& !strstr( p_item->psz_name , "global-key" ) strncmp( p_item->psz_name , "global-", 7 ) &&
&& !EMPTY_STR( p_item->psz_text ) ) !EMPTY_STR( p_item->psz_text ) )
{ {
/* /*
Each tree item has: Each tree item has:
......
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