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.pull/7566/head
parent
8b5cceed3e
commit
1f340b4b2d
|
|
@ -1046,7 +1046,12 @@ class TerminalController: BaseTerminalController {
|
||||||
//MARK: - NSWindowDelegate
|
//MARK: - NSWindowDelegate
|
||||||
|
|
||||||
override func windowShouldClose(_ sender: NSWindow) -> Bool {
|
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
|
// We will always explicitly close the window using the above
|
||||||
return false
|
return false
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue