Просмотр исходного кода

Send modal lifecycle events only if modal is not destroyed (#1166)

fixes #1162
Guy Carmeli 8 лет назад
Родитель
Сommit
76641526be
1 измененных файлов: 4 добавлений и 2 удалений
  1. 4
    2
      android/app/src/main/java/com/reactnativenavigation/controllers/Modal.java

+ 4
- 2
android/app/src/main/java/com/reactnativenavigation/controllers/Modal.java Просмотреть файл

172
 
172
 
173
     @Override
173
     @Override
174
     public void dismiss() {
174
     public void dismiss() {
175
-        NavigationApplication.instance.getEventEmitter().sendScreenChangedEvent("willDisappear", layout.getCurrentScreen().getNavigatorEventId());
176
-        NavigationApplication.instance.getEventEmitter().sendScreenChangedEvent("didDisappear", layout.getCurrentScreen().getNavigatorEventId());
175
+        if (!isDestroyed) {
176
+            NavigationApplication.instance.getEventEmitter().sendScreenChangedEvent("willDisappear", layout.getCurrentScreen().getNavigatorEventId());
177
+            NavigationApplication.instance.getEventEmitter().sendScreenChangedEvent("didDisappear", layout.getCurrentScreen().getNavigatorEventId());
178
+        }
177
         super.dismiss();
179
         super.dismiss();
178
     }
180
     }
179
 
181