Merge branch 'master' into bug/4466

src/Gui/Document.cpp

@@ -1189,6 +1189,8 @@ bool Document::saveAs(void)
             escapedstr = Base::Tools::escapeEncodeFilename(escapedstr);
             Command::doCommand(Command::Doc,"App.getDocument(\"%s\").saveAs(u\"%s\")"
                                            , DocName, escapedstr.c_str());
+            // App::Document::saveAs() may modify the passed file name
+            fi.setFile(QString::fromUtf8(d->_pcDocument->FileName.getValue()));
             setModified(false);
             getMainWindow()->appendRecentFile(fi.filePath());
         }

src/Gui/TaskView/TaskDialogPython.cpp

@@ -337,8 +337,20 @@ TaskDialogPython::~TaskDialogPython()
     std::vector< QPointer<QWidget> > guarded;
     guarded.insert(guarded.begin(), Content.begin(), Content.end());
     Content.clear();
+
     Base::PyGILStateLocker lock;
+
+    // The widgets stored in the 'form' attribute will be deleted.
+    // Thus, set this attribute to None to make sure that when using
+    // the same dialog instance for a task panel won't segfault.
+    if (this->dlg.hasAttr(std::string("form"))) {
+        this->dlg.setAttr(std::string("form"), Py::None());
+    }
     this->dlg = Py::None();
+
+    // Assigning None to 'dlg' may destroy some of the stored widgets.
+    // By guarding them with QPointer their pointers will be set to null
+    // so that the destructor of the base class can reliably call 'delete'.
     Content.insert(Content.begin(), guarded.begin(), guarded.end());
 }