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