[vlc-commits] commit: qt4: add empty-string instead skipping string on preferences. ( Ilkka Ollakka )

git at videolan.org git at videolan.org
Mon May 31 07:06:14 CEST 2010


vlc/vlc-1.1 | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Sat May 15 19:11:30 2010 +0300| [0623346676dd912ee1a06455663caf8bbd04e373] | committer: Ilkka Ollakka 

qt4: add empty-string instead skipping string on preferences.

Basicly sets setting to empty or default. Shouldn't affect others than x264-module.
(cherry picked from commit 36886f821d48b0139a91bd989988835bac0fc1a8)

Signed-off-by: Ilkka Ollakka <ileoo at videolan.org>

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

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

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index de1615a..eb36b32 100644
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -517,7 +517,10 @@ void StringListConfigControl::finish(module_config_t *p_module_config, bool byca
     for( int i_index = 0; i_index < p_module_config->i_list; i_index++ )
     {
         if( !p_module_config->ppsz_list[i_index] )
+        {
+              combo->addItem( "", QVariant(""));
               continue;
+        }
         combo->addItem( qfu((p_module_config->ppsz_list_text &&
                             p_module_config->ppsz_list_text[i_index])?
                             p_module_config->ppsz_list_text[i_index] :



More information about the vlc-commits mailing list