suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PartDesign/TaskDressUpParameters: fix a crash when editing a broken object

Browse Source
This commit is contained in:
Alexander Golubev 2015-07-24 02:52:38 +03:00 committed by Stefan Tröger
parent 0ca40ed48b
commit 9feff04aad
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp
View File

@ -75,6 +75,7 @@ const bool TaskDressUpParameters::referenceSelected(const Gui::SelectionChanges&
PartDesign::DressUp* pcDressUp = static_cast<PartDesign::DressUp*>(DressUpView->getObject()); PartDesign::DressUp* pcDressUp = static_cast<PartDesign::DressUp*>(DressUpView->getObject());
App::DocumentObject* base = this->getBase(); App::DocumentObject* base = this->getBase();
// TODO: Must we make a copy here instead of assigning to const char* ? // TODO: Must we make a copy here instead of assigning to const char* ?
const char* fname = base->getNameInDocument(); const char* fname = base->getNameInDocument();
if (strcmp(msg.pObjectName, fname) != 0) if (strcmp(msg.pObjectName, fname) != 0)
@ -168,10 +169,14 @@ void TaskDressUpParameters::showObject()
} }
} }
App::DocumentObject* TaskDressUpParameters::getBase(void) const Part::Feature* TaskDressUpParameters::getBase(void) const
{ {
PartDesign::DressUp* pcDressUp = static_cast<PartDesign::DressUp*>(DressUpView->getObject()); PartDesign::DressUp* pcDressUp = static_cast<PartDesign::DressUp*>(DressUpView->getObject());
return pcDressUp->Base.getValue(); // Unlikely but this may throw an exception in case we are started to edit an object which base feature
// was deleted. This exception will be likely unhandled inside the dialog and pass upper, But an error
// message inside the report view is better than a SEGFAULT.
// TODO: generally this situation should be prevented in ViewProviderDressUp
return pcDressUp->getBaseObject();
} }
void TaskDressUpParameters::exitSelectionMode() void TaskDressUpParameters::exitSelectionMode()

6
src/Mod/PartDesign/Gui/TaskDressUpParameters.h
View File

@ -32,6 +32,10 @@
class QListWidget; class QListWidget;
namespace Part {
class Feature;
}
namespace PartDesignGui { namespace PartDesignGui {
class TaskDressUpParameters : public Gui::TaskView::TaskBox, public Gui::SelectionObserver class TaskDressUpParameters : public Gui::TaskView::TaskBox, public Gui::SelectionObserver
@ -43,7 +47,7 @@ public:
virtual ~TaskDressUpParameters(); virtual ~TaskDressUpParameters();
const std::vector<std::string> getReferences(void) const; const std::vector<std::string> getReferences(void) const;
App::DocumentObject *getBase(void) const; Part::Feature *getBase(void) const;
void hideObject(); void hideObject();
void showObject(); void showObject();