commit | b8337131d2e1b9a3ad0d8f619c47407b4349ea89 | [log] [tgz] |
---|---|---|
author | Michael Kolb <kolby@google.com> | Mon Nov 28 15:07:39 2011 -0800 |
committer | Michael Kolb <kolby@google.com> | Mon Nov 28 15:07:39 2011 -0800 |
tree | 7d80ac98efc98bdb796f4210035726905802909b | |
parent | 63faec479010e77762d5ffa517fdc65f3474383c [diff] |
Fix NPE at startup Bug: 5676863 Change-Id: I673699e577f0ed2cfa85260f905ccccc0d852399
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) {