summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/plugins/debugger/memoryagent.cpp10
1 files 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()