diff options
| author | hjk <hjk@qt.io> | 2018-07-06 13:28:31 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2018-07-06 13:42:05 +0000 |
| commit | cb572773c0f6e6d577e29702c7484ce3f252cdff (patch) | |
| tree | 90f0cf245cbd61281d604a53da00ce113305caa9 /src | |
| parent | 887cdfa7e996156ace831109836bca4f91284da8 (diff) | |
Debugger: Robustify MainWindow state saving
Save the state before child widgets are affected.
Task-number: QTCREATORBUG-20721
Change-Id: I1d0d1ca610b0a8e8904585953ecbb42dddee4827
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/debugger/debuggermainwindow.h | 2 | ||||
| -rw-r--r-- | src/plugins/debugger/debuggerplugin.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/debugger/debuggermainwindow.h b/src/plugins/debugger/debuggermainwindow.h index cc93e7a00f..08970aaead 100644 --- a/src/plugins/debugger/debuggermainwindow.h +++ b/src/plugins/debugger/debuggermainwindow.h @@ -140,6 +140,8 @@ public: void setPerspectiveEnabled(const QByteArray &perspectiveId, bool enabled); private: + void closeEvent(QCloseEvent *) final { saveCurrentPerspective(); } + QDockWidget *registerDockWidget(const QByteArray &dockId, QWidget *widget); void loadPerspectiveHelper(const QByteArray &perspectiveId, bool fromStoredSettings = true); diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 0857b63ba6..cf0ce7d5b2 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -2799,7 +2799,6 @@ void DebuggerPluginPrivate::aboutToShutdown() disconnect(SessionManager::instance(), &SessionManager::startupProjectChanged, this, nullptr); - m_mainWindow->saveCurrentPerspective(); m_shutdownTimer.setInterval(0); m_shutdownTimer.setSingleShot(true); connect(&m_shutdownTimer, &QTimer::timeout, this, &DebuggerPluginPrivate::doShutdown); |