Daniel Zlotin 8 years ago
parent
commit
a1cef504aa

+ 2
- 1
android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java View File

104
         }
104
         }
105
         if (layout != null) {
105
         if (layout != null) {
106
             layout.destroy();
106
             layout.destroy();
107
+            layout = null;
107
         }
108
         }
108
     }
109
     }
109
 
110
 
120
 
121
 
121
     @Override
122
     @Override
122
     public void onBackPressed() {
123
     public void onBackPressed() {
123
-        if (!layout.onBackPressed()) {
124
+        if (layout != null && !layout.onBackPressed()) {
124
             NavigationApplication.instance.getReactGateway().onBackPressed();
125
             NavigationApplication.instance.getReactGateway().onBackPressed();
125
         }
126
         }
126
     }
127
     }