Skip to content

Commit 6c9fa16

Browse files
authored
fix(android): parallel navigations should not be triggered (#6275)
1 parent 1db1e81 commit 6c9fa16

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

‎tns-core-modules/ui/core/view/view.android.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ export class View extends ViewCommon {
504504

505505
public getLocationRelativeTo(otherView: ViewCommon): Point {
506506
if (!this.nativeViewProtected || !this.nativeViewProtected.getWindowToken() ||
507-
!otherView.nativeViewProtected || !otherView.nativeViewProtected.getWindowToken() ||
507+
!otherView || !otherView.nativeViewProtected || !otherView.nativeViewProtected.getWindowToken() ||
508508
this.nativeViewProtected.getWindowToken() !== otherView.nativeViewProtected.getWindowToken()) {
509509
return undefined;
510510
}

‎tns-core-modules/ui/frame/frame.android.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ export class Frame extends FrameBase {
138138
// In this case call _navigateCore in order to recreate the current fragment.
139139
// Don't call navigate because it will fire navigation events.
140140
// As JS instances are alive it is already done for the current page.
141-
if (!this.isLoaded || !this._attachedToWindow) {
141+
if (!this.isLoaded || this._executingEntry || !this._attachedToWindow) {
142142
return;
143143
}
144144

0 commit comments

Comments
 (0)