[vlc-commits] commit: OSX: fix a crash when the option-list finished by 0, like the new x264_nal_hrd ( Juho Vähä-Herttua )

[git at videolan.org]

vlc | branch: master | Juho Vähä-Herttua <juhovh at iki.fi> | Sun May 30 10:47:53 2010 +0300| [07bb7d76cabb4735262721db4d336da9984c09d8] | committer: Ilkka Ollakka 

OSX: fix a crash when the option-list finished by 0, like the new x264_nal_hrd
(cherry picked from commit 64188f7809f44b9b74f94e07bbd0381b398a6afa)

Signed-off-by: Ilkka Ollakka <ileoo at iki.fi>
(cherry picked from commit 5fd7ef49bdd60d2d9b0c007426627313dec48366)

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

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

 modules/gui/macosx/prefs_widgets.m |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gui/macosx/prefs_widgets.m b/modules/gui/macosx/prefs_widgets.m
index efe6a54..ec22b65 100644
--- a/modules/gui/macosx/prefs_widgets.m
+++ b/modules/gui/macosx/prefs_widgets.m
@@ -1074,7 +1074,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain];       \
             -2, 0, o_textfieldTooltip )
         [o_combo setAutoresizingMask:NSViewWidthSizable ];
         for( i_index = 0; i_index < p_item->i_list; i_index++ )
-            if( p_item->value.psz &&
+            if( p_item->value.psz && p_item->ppsz_list[i_index] &&
                 !strcmp( p_item->value.psz, p_item->ppsz_list[i_index] ) )
                 [o_combo selectItemAtIndex: i_index];
         [self addSubview: o_combo];
@@ -1118,7 +1118,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain];       \
     char *psz_value = config_GetPsz( VLCIntf, p_item->psz_name );
 
     for( i_index = 0; i_index < p_item->i_list; i_index++ )
-        if( psz_value &&
+        if( psz_value && p_item->ppsz_list[i_index] &&
             !strcmp( psz_value, p_item->ppsz_list[i_index] ) )
             [o_combo selectItemAtIndex: i_index];