From 7f0da4d4ebb64cb4bbef613eee6f0601defc6380 Mon Sep 17 00:00:00 2001 From: Ilari Liusvaara Date: Thu, 1 May 2014 12:32:46 +0300 Subject: [PATCH] Trace logger: Don't double free trace hooks Trying to free already freed hook should do nothing, but still don't do that. --- src/platform/wxwidgets/tracelogger.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/platform/wxwidgets/tracelogger.cpp b/src/platform/wxwidgets/tracelogger.cpp index 481c3655..65698e4c 100644 --- a/src/platform/wxwidgets/tracelogger.cpp +++ b/src/platform/wxwidgets/tracelogger.cpp @@ -596,6 +596,7 @@ namespace //Dirty hack. i.second.handle = NULL; } + trace_active = false; convert_break_to_pause(); } @@ -750,8 +751,6 @@ namespace auto tmp = this; if(!tmp->trace_active) return; - this->trace_active = false; - debug_remove_callback(cpuid, DEBUG_TRACE, trace_handle); tmp->kill_debug_hooks(); //We can't use this anymore. runuifun([tmp]() { -- 2.11.4.GIT