Browse Source

Check if activity is finishing before setting buttons

Guy Carmeli 8 years ago
parent
commit
9fc282c292

+ 1
- 5
android/app/src/main/java/com/reactnativenavigation/activities/BaseReactActivity.java View File

@@ -1,9 +1,6 @@
1 1
 package com.reactnativenavigation.activities;
2 2
 
3
-import android.content.BroadcastReceiver;
4
-import android.content.Context;
5 3
 import android.content.Intent;
6
-import android.content.IntentFilter;
7 4
 import android.content.res.Configuration;
8 5
 import android.os.Build;
9 6
 import android.os.Bundle;
@@ -29,7 +26,6 @@ import com.facebook.react.bridge.Arguments;
29 26
 import com.facebook.react.bridge.ReadableMap;
30 27
 import com.facebook.react.bridge.WritableMap;
31 28
 import com.facebook.react.common.ReactConstants;
32
-import com.facebook.react.devsupport.DevServerHelper;
33 29
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
34 30
 import com.facebook.react.shell.MainReactPackage;
35 31
 import com.reactnativenavigation.BuildConfig;
@@ -299,7 +295,7 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
299 295
     public boolean onCreateOptionsMenu(Menu menu) {
300 296
         mMenu = menu;
301 297
         Screen currentScreen = getCurrentScreen();
302
-        if (mToolbar != null && currentScreen != null) {
298
+        if (mToolbar != null && currentScreen != null && !isFinishing()) {
303 299
             mToolbar.setupToolbarButtonsAsync(currentScreen);
304 300
         }
305 301
         return super.onCreateOptionsMenu(menu);