Browse Source

Set correct Toolbar buttons after screen pop

Guy Carmeli 8 years ago
parent
commit
2a8f42adec

+ 3
- 3
android/app/src/main/java/com/reactnativenavigation/activities/SingleScreenActivity.java View File

52
     @Override
52
     @Override
53
     public Screen pop(String navigatorId) {
53
     public Screen pop(String navigatorId) {
54
         super.pop(navigatorId);
54
         super.pop(navigatorId);
55
-        Screen screen = mScreenStack.pop();
56
-        StyleHelper.updateStyles(mToolbar, screen);
57
-        return screen;
55
+        Screen popped = mScreenStack.pop();
56
+        StyleHelper.updateStyles(mToolbar, getCurrentScreen());
57
+        return popped;
58
     }
58
     }
59
 
59
 
60
     @Override
60
     @Override