Skip to content

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

* ehm, added a missing test case checking if EyeTV wasn't launch prior to VLC's launch time

parent 2c73e4b1
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
modules/gui/macosx/open.m
View file @ f2ad0a93
...@@ -235,15 +235,17 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -235,15 +235,17 @@ static VLCOpen *_o_sharedMainInstance = nil;
name: NSControlTextDidChangeNotification name: NSControlTextDidChangeNotification
object: o_net_http_url]; object: o_net_http_url];
/* wake up with the correct GUI */ /* wake up with the correct EyeTV GUI */
if( [[[VLCMain sharedInstance] getEyeTVController] isEyeTVrunning] == YES ) if( [[[VLCMain sharedInstance] getEyeTVController] isEyeTVrunning] == YES )
[o_eyetv_tabView selectTabViewItemWithIdentifier:@"nodevice"]; [o_eyetv_tabView selectTabViewItemWithIdentifier:@"nodevice"];
if( [[[VLCMain sharedInstance] getEyeTVController] isDeviceConnected] == YES ) else if( [[[VLCMain sharedInstance] getEyeTVController] isDeviceConnected] == YES )
{ {
[o_eyetv_tabView selectTabViewItemWithIdentifier:@"eyetvup"]; [o_eyetv_tabView selectTabViewItemWithIdentifier:@"eyetvup"];
[self setupChannelInfo]; [self setupChannelInfo];
} }
else
[o_eyetv_tabView selectTabViewItemWithIdentifier:@"noeyetv"];
[[NSDistributedNotificationCenter defaultCenter] addObserver: self [[NSDistributedNotificationCenter defaultCenter] addObserver: self
selector: @selector(eyetvChanged:) selector: @selector(eyetvChanged:)
name: NULL name: NULL
......
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