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

PD: Fix possible crashes in dress-up task panels

Browse Source
This commit is contained in:
wmayer
2024-07-18 15:13:29 +02:00
parent 839fd1fec0
commit c1a7edc221
6 changed files with 162 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,11 +60,11 @@ TaskDressUpParameters::TaskDressUpParameters(ViewProviderDressUp *DressUpView, b
true,
parent)
, proxy(nullptr)
, DressUpView(DressUpView)
, deleteAction(nullptr)
, addAllEdgesAction(nullptr)
, allowFaces(selectFaces)
, allowEdges(selectEdges)
, DressUpView(DressUpView)
{
// remember initial transaction ID
App::GetApplication().getActiveTransaction(&transactionID);
@@ -93,7 +93,7 @@ const QString TaskDressUpParameters::btnSelectStr()
void TaskDressUpParameters::setupTransaction()
{
if (!DressUpView)
if (DressUpView.expired())
return;
int tid = 0;
@@ -143,7 +143,7 @@ void TaskDressUpParameters::addAllEdges(QListWidget* widget)
#ifdef FC_USE_TNP_FIX
Q_UNUSED(widget)
if (!DressUpView) {
if (DressUpView.expired()) {
return;
}
@@ -401,18 +401,31 @@ void TaskDressUpParameters::showObject()
}
}
ViewProviderDressUp* TaskDressUpParameters::getDressUpView() const
{
return DressUpView.expired() ? nullptr : DressUpView.get();
}
Part::Feature* TaskDressUpParameters::getBase() const
{
PartDesign::DressUp* pcDressUp = static_cast<PartDesign::DressUp*>(DressUpView->getObject());
// 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.
// Generally this situation should be prevented in ViewProviderDressUp::setEdit()
return pcDressUp->getBaseObject();
if (ViewProviderDressUp* vp = getDressUpView()) {
auto dressUp = dynamic_cast<PartDesign::DressUp*>(vp->getObject());
// 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.
// Generally this situation should be prevented in ViewProviderDressUp::setEdit()
return dressUp->getBaseObject();
}
return nullptr;
}
void TaskDressUpParameters::setSelectionMode(selectionModes mode)
{
if (DressUpView.expired()) {
return;
}
selectionMode = mode;
setButtons(mode);