Skip to content

V
vlc-2-2
Commit 26b33258 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

* prevent the preferences from crashing. they aren't shown again yet, though

parent 41e68d84
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
modules/gui/macosx/prefs.m
View file @ 26b33258
...@@ -275,7 +275,7 @@ static VLCTreeItem *o_root_item = nil; ...@@ -275,7 +275,7 @@ static VLCTreeItem *o_root_item = nil;
module_t *p_parser; module_t *p_parser;
module_config_t *p_item, module_config_t *p_item,
*p_end; *p_end;
int i_index; int i_index = 0;
/* List the modules */ /* List the modules */
p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE ); p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
...@@ -540,7 +540,7 @@ static VLCTreeItem *o_root_item = nil; ...@@ -540,7 +540,7 @@ static VLCTreeItem *o_root_item = nil;
vlc_list_t *p_list; vlc_list_t *p_list;
module_t *p_parser = NULL; module_t *p_parser = NULL;
module_config_t *p_item, module_config_t *p_item,
*p_end = p_parser->p_config + p_parser->confsize; *p_end;
o_subviews = [[NSMutableArray alloc] initWithCapacity:10]; o_subviews = [[NSMutableArray alloc] initWithCapacity:10];
/* Get a pointer to the module */ /* Get a pointer to the module */
...@@ -552,6 +552,9 @@ static VLCTreeItem *o_root_item = nil; ...@@ -552,6 +552,9 @@ static VLCTreeItem *o_root_item = nil;
/* 0OOoo something went really bad */ /* 0OOoo something went really bad */
return nil; return nil;
} }
p_end = p_parser->p_config + p_parser->confsize;
p_item = p_parser->p_config; p_item = p_parser->p_config;
p_item = p_parser->p_config + 1; p_item = p_parser->p_config + 1;
...@@ -613,6 +616,8 @@ static VLCTreeItem *o_root_item = nil; ...@@ -613,6 +616,8 @@ static VLCTreeItem *o_root_item = nil;
msg_Err( p_intf, "could not load preferences" ); msg_Err( p_intf, "could not load preferences" );
return o_view; return o_view;
} }
p_end = p_parser->p_config + p_parser->confsize;
p_item = (p_parser->p_config + i_object_category); p_item = (p_parser->p_config + i_object_category);
if( ( p_item->i_type == CONFIG_CATEGORY ) && if( ( p_item->i_type == CONFIG_CATEGORY ) &&
( ( p_item->value.i == CAT_PLAYLIST ) || ( ( p_item->value.i == CAT_PLAYLIST ) ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment