vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Thu Jul 18 22:19:32 2019 +0300| [7c526761087bf17edb387b9c1cbb6c35f145e758] | committer: Rémi Denis-Courmont
Revert "Qt4: fix hack to detect combo config items" This broke string/integer lists. This reverts commit 417738d229f0a52a59f057832fcea8df32dec0a1. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7c526761087bf17edb387b9c1cbb6c35f145e758 --- modules/gui/qt/components/preferences_widgets.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/gui/qt/components/preferences_widgets.cpp b/modules/gui/qt/components/preferences_widgets.cpp index ee504e8f0c..af52080a5b 100644 --- a/modules/gui/qt/components/preferences_widgets.cpp +++ b/modules/gui/qt/components/preferences_widgets.cpp @@ -94,7 +94,7 @@ ConfigControl *ConfigControl::createControl( vlc_object_t *p_this, p_control = new ModuleListConfigControl( p_this, p_item, parent, true ); break; case CONFIG_ITEM_STRING: - if( p_item->list.psz_cb ) + if( p_item->list_count ) p_control = new StringListConfigControl( p_this, p_item, parent ); else p_control = new StringConfigControl( p_this, p_item, parent, false ); @@ -106,7 +106,7 @@ ConfigControl *ConfigControl::createControl( vlc_object_t *p_this, p_control = new ColorConfigControl( p_this, p_item, parent ); break; case CONFIG_ITEM_INTEGER: - if( p_item->list.i_cb ) + if( p_item->list_count ) p_control = new IntegerListConfigControl( p_this, p_item, parent, false ); else if( p_item->min.i || p_item->max.i ) p_control = new IntegerRangeConfigControl( p_this, p_item, parent ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
