From 78886c5e9c20fd681d7fe237fde7989057e5116b Mon Sep 17 00:00:00 2001 From: vakrilov Date: Fri, 24 Jul 2015 11:14:17 +0300 Subject: [PATCH] FIX: Adnroid app crashes when there is action bar on main page --- ui/action-bar/action-bar.android.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ui/action-bar/action-bar.android.ts b/ui/action-bar/action-bar.android.ts index b57a29fa5..441d86ce7 100644 --- a/ui/action-bar/action-bar.android.ts +++ b/ui/action-bar/action-bar.android.ts @@ -208,13 +208,15 @@ export class ActionBar extends common.ActionBar { } public _onTitlePropertyChanged() { - if (frame.topmost().currentPage === this.page) { + var topFrame = frame.topmost(); + if (topFrame && topFrame.currentPage === this.page) { this._updateTitleAndTitleView(frame.topmost().android.actionBar); } } public _onIconPropertyChanged() { - if (frame.topmost().currentPage === this.page) { + var topFrame = frame.topmost(); + if (topFrame && topFrame.currentPage === this.page) { this._updateIcon(frame.topmost().android.actionBar); } }