Gui: Check for every VP expiration in TaskAttacher

src/Gui/DocumentObserver.cpp

@@ -345,6 +345,10 @@ ViewProviderWeakPtrT::ViewProviderWeakPtrT(ViewProviderDocumentObject* obj)
 {
 }
 
+ViewProviderWeakPtrT::ViewProviderWeakPtrT(ViewProviderWeakPtrT&&) = default;
+
+ViewProviderWeakPtrT& ViewProviderWeakPtrT::operator=(ViewProviderWeakPtrT&&) = default;
+
 ViewProviderWeakPtrT::~ViewProviderWeakPtrT() = default;
 
 ViewProviderDocumentObject* ViewProviderWeakPtrT::_get() const noexcept

src/Gui/DocumentObserver.h

@@ -174,6 +174,12 @@ class GuiExport ViewProviderWeakPtrT
 {
 public:
     explicit ViewProviderWeakPtrT(ViewProviderDocumentObject*);
+
+    ViewProviderWeakPtrT(ViewProviderWeakPtrT &&);
+    ViewProviderWeakPtrT &operator=(ViewProviderWeakPtrT &&);
+
+    FC_DISABLE_COPY(ViewProviderWeakPtrT);
+
     ~ViewProviderWeakPtrT();
 
     /*!
@@ -221,12 +227,6 @@ public:
 private:
     ViewProviderDocumentObject* _get() const noexcept;
 
-public:
-    // disable
-    ViewProviderWeakPtrT(const ViewProviderWeakPtrT&) = delete;
-    ViewProviderWeakPtrT& operator=(const ViewProviderWeakPtrT&) = delete;
-
-private:
     class Private;
     std::unique_ptr<Private> d;
 };

src/Mod/Part/Gui/TaskAttacher.cpp

@@ -230,7 +230,7 @@ TaskAttacher::TaskAttacher(Gui::ViewProviderDocumentObject* ViewProvider, QWidge
             continue;
         }
 
-        modifiedPlaneViewProviders.push_back(planeViewProvider);
+        modifiedPlaneViewProviders.emplace_back(planeViewProvider);
 
         planeViewProvider->setTemporaryScale(ViewParams::instance()->getDatumTemporaryScaleFactor());
         planeViewProvider->setLabelVisibility(true);
@@ -267,7 +267,16 @@ TaskAttacher::~TaskAttacher()
     connectDelObject.disconnect();
     connectDelDocument.disconnect();
 
-    for (auto planeViewProvider : modifiedPlaneViewProviders) {
+    for (auto& vp : modifiedPlaneViewProviders) {
+        if (vp.expired()) {
+            continue;
+        }
+
+        auto planeViewProvider = vp.get<Gui::ViewProviderPlane>();
+        if (!planeViewProvider) {
+            return;
+        }
+
         planeViewProvider->resetTemporarySize();
         planeViewProvider->setLabelVisibility(false);
     }

src/Mod/Part/Gui/TaskAttacher.h

@@ -26,6 +26,7 @@
 #define GUI_TASKVIEW_TaskAttacher_H
 
 #include <Gui/Selection/Selection.h>
+#include <Gui/DocumentObserver.h>
 #include <Gui/ViewProviderDocumentObject.h>
 #include <Gui/TaskView/TaskView.h>
 #include <Gui/TaskView/TaskDialog.h>
@@ -159,7 +160,7 @@ private:
     Connection connectDelObject;
     Connection connectDelDocument;
 
-    std::vector<Gui::ViewProviderPlane*> modifiedPlaneViewProviders;
+    std::vector<Gui::ViewProviderWeakPtrT> modifiedPlaneViewProviders;
 
     App::PropertyOverrideContext overrides;
 };