kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Surface: fix crash when canceling filling dialog

Browse Source
This commit is contained in:
wmayer
2022-12-23 11:56:00 +01:00
parent 5915e75204
commit af33cdabe5
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Mod/Surface/Gui/TaskFilling.cpp
View File

@@ -256,6 +256,7 @@ private:
// ----------------------------------------------------------------------------
FillingPanel::FillingPanel(ViewProviderFilling* vp, Surface::Filling* obj)
: editedObject(obj)
{
ui = new Ui_TaskFilling();
ui->setupUi(this);
@@ -462,14 +463,16 @@ bool FillingPanel::accept()
bool FillingPanel::reject()
{
this->vp->highlightReferences(ViewProviderFilling::Edge,
editedObject->BoundaryEdges.getSubListValues(), false);
if (!editedObject.expired()) {
this->vp->highlightReferences(ViewProviderFilling::Edge,
editedObject->BoundaryEdges.getSubListValues(), false);
// unhighlight the referenced face
std::vector<App::PropertyLinkSubList::SubSet> links;
links.emplace_back(editedObject->InitialFace.getValue(),
editedObject->InitialFace.getSubValues());
this->vp->highlightReferences(ViewProviderFilling::Face, links, false);
// unhighlight the referenced face
std::vector<App::PropertyLinkSubList::SubSet> links;
links.emplace_back(editedObject->InitialFace.getValue(),
editedObject->InitialFace.getSubValues());
this->vp->highlightReferences(ViewProviderFilling::Face, links, false);
}
selectionMode = None;
Gui::Selection().rmvSelectionGate();
@@ -496,7 +499,7 @@ void FillingPanel::on_lineInitFaceName_textChanged(const QString& text)
void FillingPanel::on_buttonInitFace_clicked()
{
// 'selectionMode' is passed by reference and changed when the filter is deleted
Gui::Selection().addSelectionGate(new ShapeSelection(selectionMode, editedObject));
Gui::Selection().addSelectionGate(new ShapeSelection(selectionMode, editedObject.get()));
selectionMode = InitFace;
}
@@ -504,7 +507,7 @@ void FillingPanel::on_buttonEdgeAdd_toggled(bool checked)
{
if (checked) {
// 'selectionMode' is passed by reference and changed when the filter is deleted
Gui::Selection().addSelectionGate(new ShapeSelection(selectionMode, editedObject));
Gui::Selection().addSelectionGate(new ShapeSelection(selectionMode, editedObject.get()));
selectionMode = AppendEdge;
}
else if (selectionMode == AppendEdge) {
@@ -516,7 +519,7 @@ void FillingPanel::on_buttonEdgeRemove_toggled(bool checked)
{
if (checked) {
// 'selectionMode' is passed by reference and changed when the filter is deleted
Gui::Selection().addSelectionGate(new ShapeSelection(selectionMode, editedObject));
Gui::Selection().addSelectionGate(new ShapeSelection(selectionMode, editedObject.get()));
selectionMode = RemoveEdge;
}
else if (selectionMode == RemoveEdge) {

3
src/Mod/Surface/Gui/TaskFilling.h
View File

@@ -23,6 +23,7 @@
#ifndef SURFACEGUI_TASKFILLING_H
#define SURFACEGUI_TASKFILLING_H
#include <App/DocumentObserver.h>
#include <Gui/DocumentObserver.h>
#include <Gui/TaskView/TaskDialog.h>
#include <Gui/TaskView/TaskView.h>
@@ -74,7 +75,7 @@ protected:
RemoveEdge = SurfaceGui::SelectionMode::RemoveEdge
};
SelectionMode selectionMode;
Surface::Filling* editedObject;
App::WeakPtrT<Surface::Filling> editedObject;
bool checkCommand;
private: