X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finterface%2Finterface.c;h=3948b903ee3a900c83308928c8924f1f9739d3ef;hb=d38407e052d6db044ff587ed3d9cc9e802ae27cc;hp=1ac60bb5ce74ac12ef768893fb58ffa8dbfc33f5;hpb=d3fe7f28797d4dba65ffcdd60bf932e758a48a9e;p=vlc diff --git a/src/interface/interface.c b/src/interface/interface.c index 1ac60bb5ce..3948b903ee 100644 --- a/src/interface/interface.c +++ b/src/interface/interface.c @@ -224,7 +224,6 @@ int intf_RunThread( intf_thread_t *p_intf ) msleep( INTF_IDLE_SLEEP * 2); } p_intf->b_die = VLC_TRUE; - /* Do not join the thread... intf_StopThread will do it for us */ } else { @@ -468,26 +467,10 @@ static int AddIntfCallback( vlc_object_t *p_this, char const *psz_cmd, o_libvlc = p_libvlc; } -- (void)stop: (id)sender -{ - NSEvent *o_event; - NSAutoreleasePool *o_pool; - [super stop:sender]; - - o_pool = [[NSAutoreleasePool alloc] init]; - /* send a dummy event to break out of the event loop */ - o_event = [NSEvent mouseEventWithType: NSLeftMouseDown - location: NSMakePoint( 1, 1 ) modifierFlags: 0 - timestamp: 1 windowNumber: [[NSApp mainWindow] windowNumber] - context: [NSGraphicsContext currentContext] eventNumber: 1 - clickCount: 1 pressure: 0.0]; - [NSApp postEvent: o_event atStart: YES]; - [o_pool release]; -} - - (void)terminate: (id)sender { o_libvlc->b_die = VLC_TRUE; + [super terminate: sender]; } @end