commit e5732d8fc03fcd9e75cf2e458e1b9e51cc7f0a77
author Bart Sears <bsears@google.com> Mon Nov 28 18:47:50 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 28 18:47:50 2011 -0800
tree f110814bc94da08b429f3723600410e5a34de1d3
parent b049b1b3365d7eca8be5e6a90ef5dbf2dea25f02
parent 7431a694054d56b5d56410f708f97bc2a81ae5e3

am 7431a694: Merge "Fix NPE at startup" into ics-mr1

* commit '7431a694054d56b5d56410f708f97bc2a81ae5e3':
  Fix NPE at startup

src/com/android/browser/Controller.java

diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 52183eb..8dc05f8 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -1425,7 +1425,7 @@
             return;
         }
         MenuItem dest = menu.findItem(R.id.stop_reload_menu_id);
-        MenuItem src = tab.inPageLoad() ?
+        MenuItem src = ((tab != null) && tab.inPageLoad()) ?
                 menu.findItem(R.id.stop_menu_id):
                 menu.findItem(R.id.reload_menu_id);
         if (src != null) {