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

0001714: FreeCAD 0.14 Stable crashes when importing a step model

Browse Source
This commit is contained in:
wmayer 2014-09-02 11:43:51 +02:00
parent 3ecaf8778d
commit f25e6e4716
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Gui/Application.cpp
View File

@ -214,11 +214,19 @@ void ObjectLabelObserver::slotRelabelObject(const App::DocumentObject& obj, cons
} }
// make sure that there is a name conflict otherwise we don't have to do anything // make sure that there is a name conflict otherwise we don't have to do anything
if (match) { if (match && !label.empty()) {
// remove number from end to avoid lengthy names // remove number from end to avoid lengthy names
size_t lastpos = label.length()-1; size_t lastpos = label.length()-1;
while (label[lastpos] >= 48 && label[lastpos] <= 57) while (label[lastpos] >= 48 && label[lastpos] <= 57) {
// if 'lastpos' becomes 0 then all characters are digits. In this case we use
// the complete label again
if (lastpos == 0) {
lastpos = label.length()-1;
break;
}
lastpos--; lastpos--;
}
label = label.substr(0, lastpos+1); label = label.substr(0, lastpos+1);
label = Base::Tools::getUniqueName(label, objectLabels, 3); label = Base::Tools::getUniqueName(label, objectLabels, 3);
this->current = &obj; this->current = &obj;