From: Just van Rossum <just@lettererror.com>
Date: Tue, 22 Jun 1999 18:37:35 +0000 (+0000)
Subject: mod from Joe Strout: when quitting, catch errors in window.close() methods and ignore... 
X-Git-Tag: v1.6a1~1175
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d58c7464d96e212c2d0b458b9509a328a68f1961;p=thirdparty%2FPython%2Fcpython.git

mod from Joe Strout: when quitting, catch errors in window.close() methods and ignore them. Otherwise one can never quit.
---

diff --git a/Mac/Tools/IDE/PythonIDEMain.py b/Mac/Tools/IDE/PythonIDEMain.py
index b869359ad793..ae5f0e3fded7 100644
--- a/Mac/Tools/IDE/PythonIDEMain.py
+++ b/Mac/Tools/IDE/PythonIDEMain.py
@@ -228,7 +228,10 @@ class PythonIDE(Wapplication.Application):
 		PyConsole.output.writeprefs()
 		PyEdit.searchengine.writeprefs()
 		for window in self._windows.values():
-			rv = window.close()
+			try:
+				rv = window.close() # ignore any errors while quitting
+			except:
+				rv = 0   # (otherwise, we can get stuck!)
 			if rv and rv > 0:
 				return
 		self.quitting = 1