commit e76e53a590b83221eb6b97d28322b87df5449dad
author Patrick Scott Wed Apr 08 19:18:46 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Wed Apr 08 19:18:46 2009 -0700
tree ddeda24ffbbedac24ededfc9c65c2bdefed1d884
parent 3e03208a0839adfc6f8cf82b2664f9177d98e0b2
parent fb5e77fac7b8b311fe72827183f8988f5ee92a5f

Merge branch 'readonly-p4-master'

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index c9bbb35..2e4d157 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -1089,8 +1089,10 @@
         super.onDestroy();
         // Remove the current tab and sub window
         TabControl.Tab t = mTabControl.getCurrentTab();
-        dismissSubWindow(t);
-        removeTabFromContentView(t);
+        if (t != null) {
+            dismissSubWindow(t);
+            removeTabFromContentView(t);
+        }
         // Destroy all the tabs
         mTabControl.destroy();
         WebIconDatabase.getInstance().close();