- Raise console window on input. Fixes Carbon hang.
- Better handling of menu bar save/restore.
- Override abort() so it honours the "keep console window" flag.
diff --git a/Mac/Python/macmain.c b/Mac/Python/macmain.c
index bb798f2..1d5500f 100644
--- a/Mac/Python/macmain.c
+++ b/Mac/Python/macmain.c
@@ -567,7 +567,16 @@
PyMac_InitMenuBar();
console_output_state = STATE_LASTWRITE;
}
-
+
+/*
+** Override abort() - The default one is not what we want.
+*/
+void
+abort()
+{
+ console_output_state = STATE_LASTWRITE;
+ PyMac_Exit(1);
+}
/*
** Terminate application
@@ -605,6 +614,7 @@
SIOUXSettings.standalone = 1;
SIOUXSettings.autocloseonquit = 0;
SIOUXSetTitle("\p\307terminated\310");
+ PyMac_RaiseConsoleWindow();
PyMac_RestoreMenuBar();
#ifdef USE_MSL
/*