From caa6606810833a5727967f3e2ae20996d01ff970 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Martins?=
 <joao.bernardo.mota.martins@tecnico.ulisboa.pt>
Date: Wed, 26 Mar 2025 18:25:53 +0000
Subject: [PATCH] Assembly: Allow more than one assembly deactivation (#20461)

Fixes #18631.
---
 src/Gui/Document.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Gui/Document.cpp b/src/Gui/Document.cpp
index f1207b0cbf..a3e1e75acb 100644
--- a/src/Gui/Document.cpp
+++ b/src/Gui/Document.cpp
@@ -672,13 +672,14 @@ void Document::setEditingTransform(const Base::Matrix4D &mat) {
 
 void Document::resetEdit() {
     bool vpIsNotNull = d->_editViewProvider != nullptr;
+    bool vpHasChanged = d->_editViewProvider != d->_editViewProviderPrevious;
     int modeToRestore = d->_editModePrevious;
     Gui::ViewProvider* vpToRestore = d->_editViewProviderPrevious;
     bool shouldRestorePrevious = d->_editWantsRestorePrevious;
 
     Application::Instance->setEditDocument(nullptr);
 
-    if (vpIsNotNull && shouldRestorePrevious) {
+    if (vpIsNotNull && vpHasChanged && shouldRestorePrevious) {
         setEdit(vpToRestore, modeToRestore);
     }
 }