diff options
| author | hjk <hjk@qt.io> | 2019-04-09 10:49:20 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-04-09 11:16:52 +0000 |
| commit | 810a39c70611e862e6178bee08666e5a2eab0e32 (patch) | |
| tree | 753c15732cfab0127a7f96e5edaeaa6b6afdac88 | |
| parent | 712e87c041eff221d910dda59c486260d0906706 (diff) | |
Debugger: Prevent crash on destroyed perspective
Change-Id: Id000f1c74c2e614f24df1f50f710e51041fa9c38
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| -rw-r--r-- | src/plugins/debugger/debuggermainwindow.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp index 9a661eee81..598344bb25 100644 --- a/src/plugins/debugger/debuggermainwindow.cpp +++ b/src/plugins/debugger/debuggermainwindow.cpp @@ -444,7 +444,10 @@ void DebuggerMainWindow::restorePersistentSettings() qCDebug(perspectivesLog) << "LOADED DOCKS:" << theMainWindow->d->m_persistentChangedDocks; + QTC_ASSERT(theMainWindow, return); + QTC_ASSERT(theMainWindow->d, return); for (Perspective *perspective : theMainWindow->d->m_perspectives) { + QTC_ASSERT(perspective, continue); qCDebug(perspectivesLog) << "RESTORING PERSPECTIVE" << perspective->d->m_id; for (DockOperation &op : perspective->d->m_dockOperations) { if (op.operationType != Perspective::Raise) { @@ -477,6 +480,7 @@ void DebuggerMainWindow::savePersistentSettings() QSet<QString> changedDocks = theMainWindow->d->m_persistentChangedDocks; for (Perspective *perspective : theMainWindow->d->m_perspectives) { + QTC_ASSERT(perspective, continue); qCDebug(perspectivesLog) << "SAVE PERSPECTIVE" << perspective->d->m_id; for (const DockOperation &op : perspective->d->m_dockOperations) { if (op.operationType != Perspective::Raise) { |