Commit 5153494a authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: fix conditional crash when setting the MRL field

(cherry picked from commit 04b45e8ffd279a6df19ff96d6157a688bd6b7a08)

Conflicts:
	modules/gui/macosx/open.m
parent 7e97dfe8
...@@ -278,10 +278,15 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -278,10 +278,15 @@ static VLCOpen *_o_sharedMainInstance = nil;
- (void)setMRL:(NSString *)newMRL - (void)setMRL:(NSString *)newMRL
{ {
if (!newMRL)
newMRL = @"";
if (o_mrl)
[o_mrl release];
[o_mrl release]; [o_mrl release];
o_mrl = newMRL; o_mrl = newMRL;
[o_mrl retain]; [o_mrl retain];
[o_mrl_fld setStringValue: newMRL]; [o_mrl_fld performSelectorOnMainThread:@selector(setStringValue:) withObject:o_mrl waitUntilDone:NO];
if ([o_mrl length] > 0) if ([o_mrl length] > 0)
[o_btn_ok setEnabled: YES]; [o_btn_ok setEnabled: YES];
else else
......
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