From 99dff90bfa874ebd34d137e09b46e6945e4c46b2 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Fri, 20 Jan 2017 09:26:40 +0100 Subject: Debugger: Fix crash in memory agent Change-Id: I553858650102a93a90ebeae7ce3b5a29e973ace7 Reviewed-by: hjk --- src/plugins/debugger/memoryagent.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/plugins/debugger/memoryagent.cpp b/src/plugins/debugger/memoryagent.cpp index 8a5ca69a1f..fa67beb91a 100644 --- a/src/plugins/debugger/memoryagent.cpp +++ b/src/plugins/debugger/memoryagent.cpp @@ -284,12 +284,10 @@ MemoryAgent::MemoryAgent(const MemoryViewSetupData &data, DebuggerEngine *engine MemoryAgent::~MemoryAgent() { - if (m_service) { - if (m_service->editor()) - EditorManager::closeDocument(m_service->editor()->document()); - if (m_service->widget()) - m_service->widget()->close(); - } + if (m_service && m_service->editor()) + EditorManager::closeDocument(m_service->editor()->document()); + if (m_service && m_service->widget()) // m_service might be set to null by closeDocument + m_service->widget()->close(); } void MemoryAgent::updateContents() -- cgit v1.2.1