diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-19 21:29:04 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-02-20 10:41:03 +0000 |
| commit | db4d0c8742d5c0f6ee38d774ef9d052d75bbb20d (patch) | |
| tree | 4d67ea1808b759368151ce04a5d39db9e52db735 | |
| parent | 79370665b0db22ecdb4d2bc3d5906cddb9ca87b9 (diff) | |
Qt Designer: Fix exit crash on Windows
Deleting the global menu bar deletes the window menu, which
causes a crash when form windows are removed later on.
Amends 78d807bc05590cd785e485fe1d2b07e86ca9bf79.
Change-Id: I0789d77323d7c205163bbeb416452d31631c70d9
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit 73ac803c82ef37ff8dcb01d6f4d4d9b77543b20a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/designer/src/designer/qdesigner_workbench.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/designer/src/designer/qdesigner_workbench.cpp b/src/designer/src/designer/qdesigner_workbench.cpp index adef9670e..adcb508b8 100644 --- a/src/designer/src/designer/qdesigner_workbench.cpp +++ b/src/designer/src/designer/qdesigner_workbench.cpp @@ -233,6 +233,7 @@ QDesignerWorkbench::~QDesignerWorkbench() break; } delete m_globalMenuBar; + m_windowMenu = nullptr; delete m_dockedMainWindow; } @@ -589,7 +590,8 @@ void QDesignerWorkbench::removeFormWindow(QDesignerFormWindow *formWindow) if (QAction *action = formWindow->action()) { m_windowActions->removeAction(action); - m_windowMenu->removeAction(action); + if (m_windowMenu) + m_windowMenu->removeAction(action); } if (m_formWindows.isEmpty()) { |