summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2011-11-28 15:07:39 -0800
committerMichael Kolb <kolby@google.com>2011-11-28 15:07:39 -0800
commitb8337131d2e1b9a3ad0d8f619c47407b4349ea89 (patch)
tree7d80ac98efc98bdb796f4210035726905802909b /src
parent63faec479010e77762d5ffa517fdc65f3474383c (diff)
downloadpackages_apps_browser-b8337131d2e1b9a3ad0d8f619c47407b4349ea89.zip
packages_apps_browser-b8337131d2e1b9a3ad0d8f619c47407b4349ea89.tar.gz
packages_apps_browser-b8337131d2e1b9a3ad0d8f619c47407b4349ea89.tar.bz2
Fix NPE at startup
Bug: 5676863 Change-Id: I673699e577f0ed2cfa85260f905ccccc0d852399
Diffstat (limited to 'src')
-rw-r--r--src/com/android/browser/Controller.java2
1 files changed, 1 insertions, 1 deletions
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 @@ public class Controller
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) {