commit a4c9f8dec60a8c62b30581e4e1cfb68f3e1d6fe7
author Michael Kolb <kolby@google.com> Wed Nov 30 09:58:21 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 30 09:58:21 2011 -0800
tree d8d06b6d358fa285159bc9f380ae7b46bb91ffd9
parent baa898f3cc14192a671dcdc51b7904d870f89f2c
parent c5b0b2db3b917e658700642763fb50da0057716b

am c5b0b2db: Fix yet another Monkey NPE

* commit 'c5b0b2db3b917e658700642763fb50da0057716b':
  Fix yet another Monkey NPE

src/com/android/browser/Controller.java

diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 581d39a..9683a47 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -1880,7 +1880,8 @@
     }
 
     boolean isInLoad() {
-        return getCurrentTab().inPageLoad();
+        final Tab tab = getCurrentTab();
+        return (tab != null) && tab.inPageLoad();
     }
 
     // bookmark handling