commit 86508fa8f7aaa25bfa15fe7928bfcf93e1240f91
author Michael Kolb <kolby@google.com> Mon Oct 25 17:00:07 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 25 17:00:07 2010 -0700
tree b23d7704a711b9113a1c3983f043588f616ae2e3
parent 737e96834b244d6951cf1ee21016ce5a01de53aa
parent e2752f70a05d9189e645f296b2936d7a73d59d75

Merge "fix NPE when closing tab"

src/com/android/browser/TabBar.java

diff --git a/src/com/android/browser/TabBar.java b/src/com/android/browser/TabBar.java
index 432df9f..b2c687d 100644
--- a/src/com/android/browser/TabBar.java
+++ b/src/com/android/browser/TabBar.java
@@ -419,9 +419,11 @@
     @Override
     public void onRemoveTab(Tab tab) {
         TabViewData tvd = mTabMap.get(tab);
-        TabView tv = tvd.mTabView;
-        if (tv != null) {
-            mTabs.removeTab(tv);
+        if (tvd != null) {
+            TabView tv = tvd.mTabView;
+            if (tv != null) {
+                mTabs.removeTab(tv);
+            }
         }
         mTabMap.remove(tab);
     }