From a6975c8cef68542393558c3f542472bdc3bcc5cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Br=C3=A6strup=20Sayoc?= <benj5378@outlook.com>
Date: Mon, 16 Sep 2024 21:11:48 +0200
Subject: [PATCH] Revert "[Measure] Fix redundant variable assignment"

Fixes #16564. This reverts commit a7831eee4bd392dfa77f21f662466a9e72f21864.

Co-authored-by: Murmele <Murmele@users.noreply.github.com>
---
 src/Mod/Measure/Gui/TaskMeasure.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Mod/Measure/Gui/TaskMeasure.cpp b/src/Mod/Measure/Gui/TaskMeasure.cpp
index a227c31f4e..ac413e8c5c 100644
--- a/src/Mod/Measure/Gui/TaskMeasure.cpp
+++ b/src/Mod/Measure/Gui/TaskMeasure.cpp
@@ -251,6 +251,7 @@ void TaskMeasure::saveObject()
 
     _mDocument = App::GetApplication().getActiveDocument();
     _mDocument->addObject(_mMeasureObject, _mMeasureType->label.c_str());
+    _mMeasureObject = nullptr;
 }
 
 
@@ -386,6 +387,8 @@ bool TaskMeasure::apply()
 {
     saveObject();
     ensureGroup(_mMeasureObject);
+    _mMeasureType = nullptr;
+    _mMeasureObject = nullptr;
     reset();
 
     // Commit transaction
@@ -408,7 +411,6 @@ void TaskMeasure::reset()
 {
     // Reset tool state
     _mMeasureType = nullptr;
-    _mMeasureObject = nullptr;
     this->clearSelection();
 
     // Should the explicit mode also be reset?