Merge branch 'fix-remove-listener-ios' into cr-4-0-2

crunchyroll · Feb 24, 2021 · b8f336f · b8f336f
2 parents 9466978 + 8a1724f
commit b8f336f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/ios/RNGoogleCast/api/RNGCCastContext.m b/ios/RNGoogleCast/api/RNGCCastContext.m
@@ -44,6 +44,7 @@ - (void)startObserving {
 
 // Called when this module's last listener is removed, or on dealloc.
 - (void)stopObserving {
+  if (!hasListeners) { return; }
   hasListeners = NO;
   // Remove upstream listeners, stop unnecessary background tasks
   [[NSNotificationCenter defaultCenter]

diff --git a/ios/RNGoogleCast/api/RNGCCastSession.m b/ios/RNGoogleCast/api/RNGCCastSession.m
@@ -59,6 +59,7 @@ - (void)startObserving {
 }
 
 - (void)stopObserving {
+  if (!hasListeners) { return; }
   hasListeners = NO;
   dispatch_async(dispatch_get_main_queue(), ^{
     GCKCastSession *session = [GCKCastContext.sharedInstance.sessionManager currentCastSession];

diff --git a/ios/RNGoogleCast/api/RNGCDiscoveryManager.m b/ios/RNGoogleCast/api/RNGCDiscoveryManager.m
@@ -33,6 +33,7 @@ - (void)startObserving {
 
 // Will be called when this module's last listener is removed, or on dealloc.
 - (void)stopObserving {
+  if (!hasListeners) { return; }
   hasListeners = NO;
   dispatch_async(dispatch_get_main_queue(), ^{
     [GCKCastContext.sharedInstance.discoveryManager removeListener:self];

diff --git a/ios/RNGoogleCast/api/RNGCRemoteMediaClient.m b/ios/RNGoogleCast/api/RNGCRemoteMediaClient.m
@@ -54,6 +54,7 @@ - (void)startObserving {
 
 // Will be called when this module's last listener is removed, or on dealloc.
 - (void)stopObserving {
+  if (!hasListeners) { return; }
   hasListeners = NO;
   [progressTimer invalidate];
   progressTimer = nil;