[vlc-commits] commit: qt4: fix preferences, set empy as default only if setting is empty (Ilkka Ollakka )

git at videolan.org git at videolan.org
Sat May 15 19:50:25 CEST 2010


vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Sat May 15 20:50:13 2010 +0300| [cafb4269670c35cad981cbe70efe03b845fbdb08] | committer: Ilkka Ollakka 

qt4: fix preferences, set empy as default only if setting is empty

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

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

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 83602c0..e232f5d 100644
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -519,7 +519,8 @@ void StringListConfigControl::finish(module_config_t *p_module_config, bool byca
         if( !p_module_config->ppsz_list[i_index] )
         {
               combo->addItem( "", QVariant(""));
-              combo->setCurrentIndex( combo->count() - 1 );
+              if( !p_item->value.psz )
+                 combo->setCurrentIndex( combo->count() - 1 );
               continue;
         }
         combo->addItem( qfu((p_module_config->ppsz_list_text &&



More information about the vlc-commits mailing list