From 131b672f55563a60405349dbdedb34123a8b5421 Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Thu, 25 Jun 2020 11:04:06 +0200 Subject: [PATCH] QmlDesigner: Fix initial workspace change Task-number: QDS-1766 Task-number: QDS-2207 Change-Id: Ibc86b4cf5914cb10e8917198095b90073b159290 Reviewed-by: Aleksei German Reviewed-by: Thomas Hartmann --- src/libs/advanceddockingsystem/dockmanager.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libs/advanceddockingsystem/dockmanager.cpp b/src/libs/advanceddockingsystem/dockmanager.cpp index 7958b9efb63..76a62fce922 100644 --- a/src/libs/advanceddockingsystem/dockmanager.cpp +++ b/src/libs/advanceddockingsystem/dockmanager.cpp @@ -110,7 +110,7 @@ namespace ADS bool m_autorestoreLastWorkspace; // This option is set in the Workspace Manager! QSettings *m_settings = nullptr; QString m_workspacePresetsPath; - bool m_modeChangeState; + bool m_modeChangeState = false; /** * Private data constructor @@ -719,9 +719,9 @@ namespace ADS bool DockManager::openWorkspace(const QString &workspace) { - // Do nothing if we have that workspace already loaded, exception if the - // workspace is the default virgin workspace we still want to be able to - // load the default workspace. + // Do nothing if we have that workspace already loaded, exception if it is + // a preset workspace. In this case we still want to be able to load the + // default workspace to undo potential user changes. if (workspace == d->m_workspaceName && !isWorkspacePreset(workspace)) return true;