|
@@ -104,6 +104,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
|
104
|
104
|
}
|
105
|
105
|
if (layout != null) {
|
106
|
106
|
layout.destroy();
|
|
107
|
+ layout = null;
|
107
|
108
|
}
|
108
|
109
|
}
|
109
|
110
|
|
|
@@ -120,7 +121,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
|
120
|
121
|
|
121
|
122
|
@Override
|
122
|
123
|
public void onBackPressed() {
|
123
|
|
- if (!layout.onBackPressed()) {
|
|
124
|
+ if (layout != null && !layout.onBackPressed()) {
|
124
|
125
|
NavigationApplication.instance.getReactGateway().onBackPressed();
|
125
|
126
|
}
|
126
|
127
|
}
|