[vlc-commits] commit: Qt extended panels: do not spam about options about modules that don't exist in 1.2 ( Jean-Baptiste Kempf )

git at videolan.org git at videolan.org
Fri Sep 3 22:24:17 CEST 2010


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Sep  3 22:23:46 2010 +0200| [ebb2d8d15c5c1d2aa6ab1627ea30c17142bceca0] | committer: Jean-Baptiste Kempf 

Qt extended panels: do not spam about options about modules that don't exist in 1.2

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

 modules/gui/qt4/components/extended_panels.cpp |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp
index 49eef47..51952fd 100644
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -396,6 +396,7 @@ void ExtVideo::initComboBoxItems( QObject *widget )
 {
     QComboBox *combobox = qobject_cast<QComboBox*>( widget );
     if( !combobox ) return;
+
     QString option = OptionFromWidgetName( widget );
     module_config_t *p_item = config_FindConfig( VLC_OBJECT( p_intf ),
                                                  qtu( option ) );
@@ -505,11 +506,12 @@ void ExtVideo::setWidgetValue( QObject *widget )
         free( val.psz_string );
     }
     else
-        msg_Err( p_intf,
-                 "Module %s's %s variable is of an unsupported type ( %d )",
-                 qtu( module ),
-                 qtu( option ),
-                 i_type );
+        if( p_obj )
+            msg_Err( p_intf,
+                     "Module %s's %s variable is of an unsupported type ( %d )",
+                     qtu( module ),
+                     qtu( option ),
+                     i_type );
 }
 
 void ExtVideo::updateFilterOptions()



More information about the vlc-commits mailing list