Skip to content

Commit 3d54d1d

Browse files
committed
Only call onExtraWindowDestroy if nonNullDialog has been shown
1 parent 06fac8f commit 3d54d1d

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,10 @@ public class ReactModalHostView(context: ThemedReactContext) :
196196
UiThreadUtil.assertOnUiThread()
197197

198198
dialog?.let { nonNullDialog ->
199-
nonNullDialog.window?.let { window ->
200-
(context as ThemedReactContext).onExtraWindowDestroy(window)
201-
}
202199
if (nonNullDialog.isShowing) {
200+
nonNullDialog.window?.let { window ->
201+
(context as ThemedReactContext).onExtraWindowDestroy(window)
202+
}
203203
val dialogContext =
204204
ContextUtils.findContextOfType(nonNullDialog.context, Activity::class.java)
205205
if (dialogContext == null || !dialogContext.isFinishing) {

0 commit comments

Comments
 (0)