From 659d1530b07a92fec3d09e0e7f8f2eb9c16c0956 Mon Sep 17 00:00:00 2001
From: Andrew Zambazos <62979495+Bobbybear007@users.noreply.github.com>
Date: Wed, 20 May 2026 20:19:38 +1200
Subject: [PATCH] Extract BeginShutdown and unify shutdown flow

Introduce BeginShutdown() (declared in header) and move window-close shutdown logic into it. OnWindowCloseRequested and chrome close/exit handlers now call BeginShutdown; shutdown now collects closing_tab_browsers_ plus any active tab browsers into a single list before closing them. MaybeFinishShutdown was updated to consider closing_tab_browsers_ so shutdown won't finish prematurely. This centralizes shutdown behavior and ensures all relevant browser instances are closed cleanly.
---
 src/app/nebula_controller.cpp | 24 ++++++++++++++++++------
 src/app/nebula_controller.h   |  1 +
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/app/nebula_controller.cpp b/src/app/nebula_controller.cpp
index 29932a0..c5b8a98 100644
--- a/src/app/nebula_controller.cpp
+++ b/src/app/nebula_controller.cpp
@@ -228,6 +228,10 @@ void NebulaController::OnWindowCloseRequested() {
         return;
     }
 
+    BeginShutdown();
+}
+
+void NebulaController::BeginShutdown() {
     if (closing_) {
         if (window_ && window_->native_handle()) {
             nebula::platform::DestroyTopLevelWindow(window_->native_handle());
@@ -242,6 +246,13 @@ void NebulaController::OnWindowCloseRequested() {
         cookie_manager->FlushStore(nullptr);
     }
 
+    std::vector<CefRefPtr<CefBrowser>> content_browsers = closing_tab_browsers_;
+    for (const auto& tab : tabs_.Tabs()) {
+        if (tab.browser) {
+            content_browsers.push_back(tab.browser);
+        }
+    }
+
     if (chrome_browser_) {
         chrome_browser_->GetHost()->CloseBrowser(true);
     }
@@ -251,9 +262,9 @@ void NebulaController::OnWindowCloseRequested() {
     if (menu_popup_browser_) {
         menu_popup_browser_->GetHost()->CloseBrowser(true);
     }
-    for (const auto& tab : tabs_.Tabs()) {
-        if (tab.browser) {
-            tab.browser->GetHost()->CloseBrowser(true);
+    for (const auto& browser : content_browsers) {
+        if (browser) {
+            browser->GetHost()->CloseBrowser(true);
         }
     }
 
@@ -418,10 +429,10 @@ void NebulaController::OnChromeCommand(const std::string& command, const std::st
     } else if (command == "maximize" && window_) {
         window_->ToggleMaximize();
     } else if (command == "close" && window_) {
-        OnWindowCloseRequested();
+        BeginShutdown();
     } else if (command == "exit-bigpicture" && window_) {
         if (launch_options_.mode == AppMode::BigPicture) {
-            OnWindowCloseRequested();
+            BeginShutdown();
             return;
         }
         ExitBigPictureMode();
@@ -1189,7 +1200,8 @@ void NebulaController::MaybeFinishShutdown() {
         return;
     }
 
-    if (chrome_browser_ || big_picture_browser_ || menu_popup_browser_ || tabs_.HasOpenBrowsers()) {
+    if (chrome_browser_ || big_picture_browser_ || menu_popup_browser_ ||
+        tabs_.HasOpenBrowsers() || !closing_tab_browsers_.empty()) {
         return;
     }
 
diff --git a/src/app/nebula_controller.h b/src/app/nebula_controller.h
index 97a1825..6ceb03a 100644
--- a/src/app/nebula_controller.h
+++ b/src/app/nebula_controller.h
@@ -77,6 +77,7 @@ private:
     void InjectBigPictureCursor(CefRefPtr<CefBrowser> browser);
     void RemoveBigPictureCursor(CefRefPtr<CefBrowser> browser);
     void PersistSession() const;
+    void BeginShutdown();
     void MaybeFinishShutdown();
     bool ForgetClosingTabBrowser(CefRefPtr<CefBrowser> browser);