Merge "Fix NPE at startup" into ics-mr1

7431a694 · Bart Sears · Android (Google) Code Review · 6cfe9772 · b8337131 · 7431a694
Commit 7431a694 authored 13 years ago by Bart Sears Committed by Android (Google) Code Review 13 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

src/com/android/browser/Controller.java src/com/android/browser/Controller.java +1 -1

No files found.
--- 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) {