From: Ned Deily <nad@python.org>
Date: Tue, 2 Nov 2021 21:06:11 +0000 (-0400)
Subject: bpo-44828: Avoid leaving a zombie Save panel. (GH-29371)
X-Git-Tag: v3.9.8~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d53d9e7f4f1656a13b030b17baca743455e511fd;p=thirdparty%2FPython%2Fcpython.git

bpo-44828: Avoid leaving a zombie Save panel. (GH-29371)

Patch by Marc Culler of the Tk project.
---

diff --git a/Mac/BuildScript/bpo-44828-filedialog-crash-monterey.patch b/Mac/BuildScript/bpo-44828-filedialog-crash-monterey.patch
index 1d06329fff3f..059149250f8c 100644
--- a/Mac/BuildScript/bpo-44828-filedialog-crash-monterey.patch
+++ b/Mac/BuildScript/bpo-44828-filedialog-crash-monterey.patch
@@ -18,7 +18,7 @@
  
      if (returnCode >= NSAlertFirstButtonReturn) {
  	Tcl_Obj *resultObj = Tcl_NewStringObj(alertButtonStrings[
-@@ -350,49 +350,41 @@
+@@ -350,49 +350,42 @@
      FilePanelCallbackInfo *callbackInfo)
  {
      NSInteger modalReturnCode;
@@ -85,6 +85,7 @@
 -	    [panel close];
 +			  returnCode:modalReturnCode
 +			 contextInfo:callbackInfo ];
++		[parent endSheet:panel];
  	}
 +    } else {
 +	modalReturnCode = [panel runModal];