javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 11:42:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #902 from NativeScript/backstack-critical-fix

Browse Source 
Added check for backStackEntryCount before trying to read the first e…
This commit is contained in:
Rossen Hristov
2015-10-08 11:28:17 +03:00
parent 87d2943f6c 02748f4fc0
commit a396fd397e
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ui/frame/frame.android.ts
View File

@ -234,7 +234,8 @@ export class Frame extends frameCommon.Frame {
// Clear history
if (backstackEntry.entry.clearHistory && !this._isFirstNavigation) {
var i = manager.getBackStackEntryCount() - 1;
var backStackEntryCount = manager.getBackStackEntryCount();
var i = backStackEntryCount - 1;
var fragment: android.app.Fragment;
while (i >= 0) {
fragment = manager.findFragmentByTag(manager.getBackStackEntryAt(i--).getName());
@ -251,9 +252,11 @@ export class Frame extends frameCommon.Frame {
}
}
var firstEntryName = manager.getBackStackEntryAt(0).getName();
trace.write(`manager.popBackStack(${firstEntryName}, android.app.FragmentManager.POP_BACK_STACK_INCLUSIVE);`, trace.categories.NativeLifecycle);
manager.popBackStack(firstEntryName, android.app.FragmentManager.POP_BACK_STACK_INCLUSIVE);
if (backStackEntryCount) {
var firstEntryName = manager.getBackStackEntryAt(0).getName();
trace.write(`manager.popBackStack(${firstEntryName}, android.app.FragmentManager.POP_BACK_STACK_INCLUSIVE);`, trace.categories.NativeLifecycle);
manager.popBackStack(firstEntryName, android.app.FragmentManager.POP_BACK_STACK_INCLUSIVE);
}
this._currentEntry = null;
navDepth = -1;
}