diff options
| author | David Schulz <david.schulz@qt.io> | 2017-01-20 09:26:40 +0100 |
|---|---|---|
| committer | David Schulz <david.schulz@qt.io> | 2017-01-20 08:51:48 +0000 |
| commit | 99dff90bfa874ebd34d137e09b46e6945e4c46b2 (patch) | |
| tree | 24b9f90d13dfe6a34ff024bf0fe413ef39900d2d | |
| parent | 6eb89ad2ed1a762ecc005f98f46749545b8a86c7 (diff) | |
| download | qt-creator-99dff90bfa874ebd34d137e09b46e6945e4c46b2.tar.gz | |
Debugger: Fix crash in memory agent
Change-Id: I553858650102a93a90ebeae7ce3b5a29e973ace7
Reviewed-by: hjk <hjk@qt.io>
| -rw-r--r-- | src/plugins/debugger/memoryagent.cpp | 10 |
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() |