macosx: fixed rare crash when saving the full prefs

68e5d329 · Felix Paul Kühne · b114b7e6 · 68e5d329
Commit 68e5d329 authored Jun 01, 2011 by Felix Paul Kühne
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 5 deletions

modules/gui/macosx/prefs_widgets.m modules/gui/macosx/prefs_widgets.m +8 -5

No files found.
--- a/modules/gui/macosx/prefs_widgets.m
+++ b/modules/gui/macosx/prefs_widgets.m
@@ -1124,11 +1124,14 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain];       \

 - (char *)stringValue
 {
-    if( [o_combo indexOfSelectedItem] >= 0 )
-        return strdup( p_item->ppsz_list[[o_combo indexOfSelectedItem]] );
-    else
-        return strdup( [[VLCMain sharedInstance]
-                            delocalizeString: [o_combo stringValue]] );
+    if( [o_combo indexOfSelectedItem] >= 0 ) {
+        if( p_item->ppsz_list[[o_combo indexOfSelectedItem]] != NULL )
+            return strdup( p_item->ppsz_list[[o_combo indexOfSelectedItem]] );
+    } else {
+        if( [[VLCMain sharedInstance] delocalizeString: [o_combo stringValue]] != NULL )
+            return strdup( [[VLCMain sharedInstance] delocalizeString: [o_combo stringValue]] );
+    }
+    return NULL;
 }

 - (void)resetValues