commit f05efb7bb0d4fa5e2867cb254ab84b461d1e1889
author Eric Fischer <enf@google.com> Tue Nov 29 11:08:52 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 29 11:08:52 2011 -0800
tree 5558f227a002d63016c3e23bf486f878fec51833
parent 164eeed6358cb6c4fece427ba12eaca6a65458d6
parent 9ee774abacac4d4abbcdd5be63a944cc45f29eaf

Merge "Import revised translations."

src/com/android/browser/Controller.java

diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 7c73411..581d39a 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -1436,7 +1436,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) {