- don't push current pane to backstack if it was called via back button
- fixes endless loop of while toggling panes
This commit is contained in:
parent
7140cd41d7
commit
7b69693a3f
@ -370,6 +370,7 @@ public class IITC_Mobile extends Activity implements OnSharedPreferenceChangeLis
|
||||
// Pop last item from backstack and pretend the relevant menu item was clicked
|
||||
if (!mBackStack.isEmpty()) {
|
||||
backStackPop();
|
||||
mBackButtonPressed = true;
|
||||
return;
|
||||
}
|
||||
|
||||
@ -405,8 +406,10 @@ public class IITC_Mobile extends Activity implements OnSharedPreferenceChangeLis
|
||||
|
||||
// map pane is top-lvl. clear stack.
|
||||
if (pane == Pane.MAP) mBackStack.clear();
|
||||
else mBackStack.push(mCurrentPane);
|
||||
// don't push current pane to backstack if this method was called via back button
|
||||
else if (!mBackButtonPressed) mBackStack.push(mCurrentPane);
|
||||
|
||||
mBackButtonPressed = false;
|
||||
mCurrentPane = pane;
|
||||
mNavigationHelper.switchTo(pane);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user