fix: add check for if container is null (#1375)

Added check for if _container is nil which leads to app crash if invalidate was called before didMoveToWindow (e.g. navigating back from screen with navigation.goBack()).
software-mansion · Mar 28, 2022 · a12e257 · a12e257
1 parent ef0e103
commit a12e257
Showing 1 changed file with 5 additions and 12 deletions.
diff --git a/ios/RNSFullWindowOverlay.m b/ios/RNSFullWindowOverlay.m
@@ -63,20 +63,13 @@ - (void)show
   [window addSubview:_container];
 }
 
-- (void)hide
-{
-  if (!_container) {
-    return;
-  }
-
-  [_container removeFromSuperview];
-}
-
 - (void)didMoveToWindow
 {
   if (self.window == nil) {
-    [self hide];
-    [_touchHandler detachFromView:_container];
+    if (_container != nil) {
+      [_container removeFromSuperview];
+      [_touchHandler detachFromView:_container];
+    }
   } else {
     if (_touchHandler == nil) {
       _touchHandler = [[RCTTouchHandler alloc] initWithBridge:_bridge];
@@ -87,7 +80,7 @@ - (void)didMoveToWindow
 
 - (void)invalidate
 {
-  [self hide];
+  [_container removeFromSuperview];
   _container = nil;
 }