From d385a2350b8ae2a7e62dc53237d4dd6eb0ab9831 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@qt.io>
Date: Tue, 16 Apr 2024 13:26:33 +0300
Subject: [PATCH] QmlDesigner: Reset camera speeds when project changes

Fixes: QDS-12297
Change-Id: Ia86f2290cdc94e637b7c12f48b379c429338ff0e
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
---
 src/plugins/qmldesigner/components/edit3d/edit3dview.cpp | 8 ++++++++
 src/plugins/qmldesigner/components/edit3d/edit3dview.h   | 1 +
 2 files changed, 9 insertions(+)

diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp
index e560ed16ac5..a20904b2e5d 100644
--- a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp
+++ b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp
@@ -279,6 +279,14 @@ void Edit3DView::modelAttached(Model *model)
 {
     AbstractView::modelAttached(model);
 
+    QString currProjectPath = QmlDesigner::DocumentManager::currentProjectDirPath().toString();
+    if (m_currProjectPath != currProjectPath) {
+        // Opening a new project -> reset camera speeds
+        m_currProjectPath = currProjectPath;
+        m_previousCameraSpeed = -1.;
+        m_previousCameraMultiplier = -1.;
+    }
+
     syncSnapAuxPropsToSettings();
 
     rootModelNode().setAuxiliaryData(edit3dGridColorProperty,
diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dview.h b/src/plugins/qmldesigner/components/edit3d/edit3dview.h
index 781b26d8d8d..fad87aae1f1 100644
--- a/src/plugins/qmldesigner/components/edit3d/edit3dview.h
+++ b/src/plugins/qmldesigner/components/edit3d/edit3dview.h
@@ -192,6 +192,7 @@ private:
 
     double m_previousCameraSpeed = -1.;
     double m_previousCameraMultiplier = -1.;
+    QString m_currProjectPath;
 
     friend class Edit3DAction;
 };