From 58f717a1a487fd7fc3b9fe1c0e1f182de1c90fdc Mon Sep 17 00:00:00 2001
From: Nat Quayle Nelson <natquaylenelson@gmail.com>
Date: Sun, 4 May 2025 08:25:28 -0500
Subject: [PATCH] Fix mainPtr losing focus on Mac after dialog close

---
 src/dialogxml/dialogs/dialog.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/dialogxml/dialogs/dialog.cpp b/src/dialogxml/dialogs/dialog.cpp
index 9309da30..ccd9e0b1 100644
--- a/src/dialogxml/dialogs/dialog.cpp
+++ b/src/dialogxml/dialogs/dialog.cpp
@@ -631,15 +631,17 @@ void cDialog::handleTab(bool reverse) {
 
 void cDialog::stackWindowsCorrectly() {
 	// Put all dialogs in correct z order:
-	std::vector<sf::RenderWindow*> dialog_stack;
+	std::vector<cDialog*> dialog_stack;
 	cDialog* next = this;
 	while(next != nullptr){
-		dialog_stack.push_back(&(next->win));
+		dialog_stack.push_back(next);
 		next = next->parent;
 	}
 	makeFrontWindow(mainPtr());
 	for(int i = dialog_stack.size() - 1; i >= 0; --i){
-		makeFrontWindow(*(dialog_stack[i]));
+		if(dialog_stack[i]->dialogNotToast){
+			makeFrontWindow(dialog_stack[i]->win);
+		}
 	}
 }