From 1134b0dbbd3fa2afe5ea3989ea3b0d4f4682a4ef Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Tue, 10 Jan 2012 22:44:11 +0100 Subject: Fix _PyFaulthandler_Fini() so it can be called before _PyFaulthandler_Init() --- Modules/faulthandler.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 @@ void _PyFaulthandler_Fini(void) #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 @@ void _PyFaulthandler_Fini(void) #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; -- cgit v0.12