commit 3055c7665a0ad0c279d0d3e3f166199d610591a8
author Jeff Brown <jeffbrown@google.com> Tue Nov 29 13:13:52 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 29 13:13:52 2011 -0800
tree 8ab68c6e2366579a4b29cee6363f5c0d8da578ba
parent 7431a694054d56b5d56410f708f97bc2a81ae5e3
parent 6af55fa58347beb263ef4ad747d379554304d581

Merge "Add application launch category." into ics-mr1

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) {