commit 1134b0dbbd3fa2afe5ea3989ea3b0d4f4682a4ef
author Victor Stinner <victor.stinner@haypocalc.com> Tue Jan 10 22:44:11 2012 +0100
committer Victor Stinner <victor.stinner@haypocalc.com> Tue Jan 10 22:44:11 2012 +0100
tree d576e204cc1920f77a33823a8baba3877732c121
parent 76961faaa0323580caac8068848c33b7aeec13ee

Fix _PyFaulthandler_Fini() so it can be called before _PyFaulthandler_Init()

Modules/faulthandler.c

diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c
index 51c66bd..fcf4d01 100644
--- a/Modules/faulthandler.c
+++ b/Modules/faulthandler.c
@@ -1282,8 +1282,8 @@
 
 #ifdef FAULTHANDLER_LATER
     /* later */
-    cancel_dump_tracebacks_later();
     if (thread.cancel_event) {
+        cancel_dump_tracebacks_later();
         PyThread_release_lock(thread.cancel_event);
         PyThread_free_lock(thread.cancel_event);
         thread.cancel_event = NULL;
@@ -1296,8 +1296,8 @@
 
 #ifdef FAULTHANDLER_WATCHDOG
     /* file watchdog */
-    cancel_file_watchdog();
     if (watchdog.cancel_event) {
+        cancel_file_watchdog();
         PyThread_release_lock(watchdog.cancel_event);
         PyThread_free_lock(watchdog.cancel_event);
         watchdog.cancel_event = NULL;