From a0b334c19ea55a84228aa63c50c87f4b69c62b17 Mon Sep 17 00:00:00 2001 From: Margaret Leibovic Date: Wed, 29 Feb 2012 13:25:41 -0800 Subject: [PATCH] Bug 731019 - java.lang.NullPointerException: at org.mozilla.gecko.AwesomeBarTabs.onBackPressed(AwesomeBarTabs.java). r=lucasr --- mobile/android/base/AwesomeBarTabs.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mobile/android/base/AwesomeBarTabs.java b/mobile/android/base/AwesomeBarTabs.java index 5ae77b888ae..33f51ee4858 100644 --- a/mobile/android/base/AwesomeBarTabs.java +++ b/mobile/android/base/AwesomeBarTabs.java @@ -319,8 +319,10 @@ public class AwesomeBarTabs extends TabHost { // This method checks to see if we're in a bookmark sub-folder. If we are, // it will go up a level and return true. Otherwise it will return false. public boolean onBackPressed() { - // If we're not in the bookmarks tab, we have nothing to do - if (!getCurrentTabTag().equals(BOOKMARKS_TAB)) + // If we're not in the bookmarks tab, we have nothing to do. We should + // also return false if mBookmarksAdapter hasn't been initialized yet. + if (!getCurrentTabTag().equals(BOOKMARKS_TAB) || + mBookmarksAdapter == null) return false; return mBookmarksAdapter.moveToParentFolder();