Skip to content

V
vlc-2-2
Commit 2bbc88ce authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

OSX: fix crash when no SD are found

parent e8ede98d
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
modules/gui/macosx/MainWindow.m
View file @ 2bbc88ce
...@@ -227,8 +227,8 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -227,8 +227,8 @@ static VLCMainWindow *_o_sharedInstance = nil;
SideBarItem *internetItem = [SideBarItem itemWithTitle:_NS("INTERNET") identifier:@"internet"]; SideBarItem *internetItem = [SideBarItem itemWithTitle:_NS("INTERNET") identifier:@"internet"];
/* SD subnodes, inspired by the Qt4 intf */ /* SD subnodes, inspired by the Qt4 intf */
char **ppsz_longnames; char **ppsz_longnames = NULL;
int *p_categories; int *p_categories = NULL;
char **ppsz_names = vlc_sd_GetNames(pl_Get(VLCIntf), &ppsz_longnames, &p_categories); char **ppsz_names = vlc_sd_GetNames(pl_Get(VLCIntf), &ppsz_longnames, &p_categories);
if (!ppsz_names) if (!ppsz_names)
msg_Err(VLCIntf, "no sd item found"); //TODO msg_Err(VLCIntf, "no sd item found"); //TODO
...@@ -239,7 +239,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -239,7 +239,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
NSMutableArray *lanItems = [[NSMutableArray alloc] init]; NSMutableArray *lanItems = [[NSMutableArray alloc] init];
NSMutableArray *mycompItems = [[NSMutableArray alloc] init]; NSMutableArray *mycompItems = [[NSMutableArray alloc] init];
NSString *o_identifier; NSString *o_identifier;
for (; *ppsz_name; ppsz_name++, ppsz_longname++, p_category++) { for (; ppsz_name && *ppsz_name; ppsz_name++, ppsz_longname++, p_category++) {
o_identifier = [NSString stringWithCString: *ppsz_name encoding: NSUTF8StringEncoding]; o_identifier = [NSString stringWithCString: *ppsz_name encoding: NSUTF8StringEncoding];
switch (*p_category) { switch (*p_category) {
case SD_CAT_INTERNET: case SD_CAT_INTERNET:
......
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