From 1d604d327c2485e5635e95a3e6dd9337361cb4f5 Mon Sep 17 00:00:00 2001
From: ekager <ekager@mozilla.com>
Date: Mon, 27 Jul 2020 12:30:30 -0400
Subject: [PATCH] For #12966 - Fixes session removal show home logic

---
 .../java/org/mozilla/fenix/browser/BaseBrowserFragment.kt     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index 1a5636e99..831acd06c 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -831,7 +831,9 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
                 if (session.hasParentSession) {
                     sessionManager.remove(session, true)
                 }
-                val goToOverview = isLastSession || !session.hasParentSession
+                // We want to return to home if this removed session was the last session of its type
+                // and didn't have a parent session to select.
+                val goToOverview = isLastSession && !session.hasParentSession
                 !goToOverview
             }
         }