From 3f8fd2dd771b007e52bef3bbd75a164c70bd9fdc Mon Sep 17 00:00:00 2001
From: Sriram Ramasubramanian <sriram@mozilla.com>
Date: Thu, 14 Jun 2012 12:12:09 -0700
Subject: [PATCH] Bug 762717: selectTab() should be called after closeTab().
 [r=margaret]

--HG--
extra : rebase_source : 71c641402c2a7dc0716bd1f7029395e6e38b4297
---
 mobile/android/base/Tabs.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mobile/android/base/Tabs.java b/mobile/android/base/Tabs.java
index ef79baa3a3f7..b66069dbdb11 100644
--- a/mobile/android/base/Tabs.java
+++ b/mobile/android/base/Tabs.java
@@ -157,8 +157,6 @@ public class Tabs implements GeckoEventListener {
         if (tab == null || nextTab == null)
             return;
 
-        selectTab(nextTab.getId());
-
         int tabId = tab.getId();
         removeTab(tabId);
         tab.onDestroy();
@@ -171,6 +169,9 @@ public class Tabs implements GeckoEventListener {
 
         // Pass a message to Gecko to update tab state in BrowserApp
         GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Tab:Closed", String.valueOf(tabId)));
+
+        // Next tab selection should happen after closing the tab.
+        selectTab(nextTab.getId());
     }
 
     /** Return the tab that will be selected by default after this one is closed */