Browse Source

media discoverer: cosmetics

Felix Paul Kühne 10 years ago
parent
commit
624139ce47
1 changed files with 3 additions and 2 deletions
  1. 3 2
      Sources/VLCMediaDiscoverer.m

+ 3 - 2
Sources/VLCMediaDiscoverer.m

@@ -71,7 +71,7 @@ static void HandleMediaDiscovererEnded(const libvlc_event_t *event, void *self)
     @autoreleasepool {
         [[VLCEventManager sharedManager] callOnMainThreadObject:(__bridge id)(self)
                                                      withMethod:@selector(_mediaDiscovererEnded)
-                                           withArgumentAsObject:nil];
+                                           withArgumentAsObject:@(event->type)];
     }
 }
 
@@ -121,12 +121,13 @@ static void HandleMediaDiscovererEnded(const libvlc_event_t *event, void *self)
     if (_running)
         [self stopDiscoverer];
 
+    [[VLCEventManager sharedManager] cancelCallToObject:self];
+
     libvlc_event_manager_t *em = libvlc_media_discoverer_event_manager(_mdis);
     if (em) {
         libvlc_event_detach(em, libvlc_MediaDiscovererStarted, HandleMediaDiscovererStarted, (__bridge void *)(self));
         libvlc_event_detach(em, libvlc_MediaDiscovererEnded,   HandleMediaDiscovererEnded,   (__bridge void *)(self));
     }
-    [[VLCEventManager sharedManager] cancelCallToObject:self];
 
     libvlc_media_discoverer_release(_mdis);