From e206ff5692fbe64225d6a4a48f1152462788016b Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Fri, 7 Dec 2012 17:34:25 -0500 Subject: [PATCH] Fix crash in TeamDebugger. - TeamDebugger's destructor was assuming the report generator object had always been created, which might not be the case. Fixes second part of #9273. --- src/apps/debugger/controllers/TeamDebugger.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/apps/debugger/controllers/TeamDebugger.cpp b/src/apps/debugger/controllers/TeamDebugger.cpp index 6c8f43ecd29..a84a3205ada 100644 --- a/src/apps/debugger/controllers/TeamDebugger.cpp +++ b/src/apps/debugger/controllers/TeamDebugger.cpp @@ -277,13 +277,17 @@ TeamDebugger::~TeamDebugger() thread = next; } } + + if (fReportGenerator != NULL) { + fReportGenerator->Lock(); + fReportGenerator->Quit(); + } + delete fImageInfoPendingThreads; delete fBreakpointManager; delete fWatchpointManager; delete fMemoryBlockManager; - fReportGenerator->Lock(); - fReportGenerator->Quit(); delete fWorker; delete fTeam; delete fFileManager;