commit 241f4f579230ae8394c71a5f10705d7f978ef535
author Leon Scroggins III <scroggo@google.com> Fri Sep 17 08:21:24 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 17 08:21:24 2010 -0700
tree bd7b8efbee20a5436ba7207088ccaff75b3dcbcb
parent 4d5db5dcd1b4a4e3ab358f60ff4fab9517c9ccb2
parent e680381839dee8d0ebdc6dd8cf882f66ea5c6c1a

am e6803818: am a9e35b6e: Prevent a null pointer exception.

Merge commit 'e680381839dee8d0ebdc6dd8cf882f66ea5c6c1a'

* commit 'e680381839dee8d0ebdc6dd8cf882f66ea5c6c1a':
  Prevent a null pointer exception.

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index ca63305..c3d3d9c 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -4146,11 +4146,15 @@
             // Nothing to do.
             return;
         }
+        Tab t = mTabControl.getCurrentTab();
+        if (t == null) {
+            // There is no current tab so we cannot toggle the error console
+            return;
+        }
 
         mShouldShowErrorConsole = flag;
 
-        ErrorConsoleView errorConsole = mTabControl.getCurrentTab()
-                .getErrorConsole(true);
+        ErrorConsoleView errorConsole = t.getErrorConsole(true);
 
         if (flag) {
             // Setting the show state of the console will cause it's the layout to be inflated.