From 1f340b4b2dc8e2f9752bee8702a555e8bd367b51 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 10 Jun 2025 12:39:09 -0700
Subject: [PATCH] macos: for windowShouldClose, only close the tab if we have
 multiple

Fixes a regression from our undo/redo rework. We were accidentally
closing the entire window when the "X" button in the tab bar was
clicked.
---
 macos/Sources/Features/Terminal/TerminalController.swift | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/macos/Sources/Features/Terminal/TerminalController.swift b/macos/Sources/Features/Terminal/TerminalController.swift
index c9f8ef216..a984952f9 100644
--- a/macos/Sources/Features/Terminal/TerminalController.swift
+++ b/macos/Sources/Features/Terminal/TerminalController.swift
@@ -1046,7 +1046,12 @@ class TerminalController: BaseTerminalController {
     //MARK: - NSWindowDelegate
 
     override func windowShouldClose(_ sender: NSWindow) -> Bool {
-        closeWindow(sender)
+        // If we have tabs, then this should only close the tab.
+        if window?.tabGroup?.windows.count ?? 0 > 1 {
+            closeTab(sender)
+        } else {
+            closeWindow(sender)
+        }
 
         // We will always explicitly close the window using the above
         return false