From 3d28c516c6449f995ab3341df54084fbed8ae18c Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@theqtcompany.com>
Date: Wed, 20 Apr 2016 18:15:21 +0200
Subject: [PATCH] Debugger: Avoid soft assert on close
Introduced with d432b1447284cb95f966330c9dced175aa3fc21f.
Change-Id: Ic33d46a33efd1c09c162c6adc31526efd4fe2b9d
Reviewed-by: hjk <hjk@theqtcompany.com>
---
src/plugins/debugger/debuggerplugin.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index b1154cdbbdf..44aacba4cf7 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -2759,8 +2759,10 @@ void DebuggerPluginPrivate::coreShutdown()
{
m_shuttingDown = true;
if (currentEngine()) {
- currentEngine()->setTargetState(Debugger::DebuggerFinished);
- currentEngine()->abortDebugger();
+ if (currentEngine()->state() != Debugger::DebuggerNotReady) {
+ currentEngine()->setTargetState(Debugger::DebuggerFinished);
+ currentEngine()->abortDebugger();
+ }
}
}
--
GitLab