From 317e0b11bf0ade91f2cd81fc39bf4f634c058a04 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 15 Dec 2021 15:36:36 +0100 Subject: [PATCH] PD: do not throw an exception in TaskSketchBasedParameters::make2DLabel as otherwise editing a broken loft/pipe won't be possible --- .../PartDesign/Gui/TaskSketchBasedParameters.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp b/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp index 3141bc9fe2..51899349d9 100644 --- a/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp @@ -227,14 +227,15 @@ QString TaskSketchBasedParameters::getFaceReference(const QString& obj, const QS QString TaskSketchBasedParameters::make2DLabel(const App::DocumentObject* section, const std::vector& subValues) { - if(section->isDerivedFrom(Part::Part2DObject::getClassTypeId())) + if (section->isDerivedFrom(Part::Part2DObject::getClassTypeId())) { return QString::fromUtf8(section->Label.getValue()); + } + else if (subValues.empty()) { + Base::Console().Error("No valid subelement linked in %s\n", section->Label.getValue()); + return QString(); + } else { - if(subValues.empty()) - throw Base::ValueError("No valid subelement linked in Part::Feature"); - - return QString::fromUtf8((std::string(section->getNameInDocument()) - + ":" + subValues[0]).c_str()); + return QString::fromStdString((std::string(section->getNameInDocument()) + ":" + subValues[0])); } }