[vlc-commits] Qt4: fix hack to detect combo config items

Rémi Denis-Courmont git at videolan.org
Sat Sep 15 09:33:27 CEST 2012


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Sep 15 10:31:34 2012 +0300| [417738d229f0a52a59f057832fcea8df32dec0a1] | committer: Rémi Denis-Courmont

Qt4: fix hack to detect combo config items

Zero items count means there is no static list. But there could be a
dynamic list. Qt should not access config items directly.

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

 modules/gui/qt4/components/preferences_widgets.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 8c1a0cc..72b9781 100644
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -93,7 +93,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_count )
+        if( p_item->list.psz_cb )
             p_control = new StringListConfigControl( p_this, p_item, parent );
         else
             p_control = new StringConfigControl( p_this, p_item, parent, false );
@@ -105,7 +105,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_count )
+        if( p_item->list.i_cb )
             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 );



More information about the vlc-commits mailing list