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

Fixed crash when empty lines in App::Annotation - fixes #2016

Browse Source
This commit is contained in:
Yorik van Havre 2015-09-01 11:48:08 -03:00
parent d0e43137ce
commit 9426a77690
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Gui/ViewProviderAnnotation.cpp
View File

@ -224,14 +224,17 @@ void ViewProviderAnnotation::updateData(const App::Property* prop)
pLabel->string.setNum((int)lines.size());
pLabel3d->string.setNum((int)lines.size());
for (std::vector<std::string>::const_iterator it = lines.begin(); it != lines.end(); ++it) {
const char* cs = it->c_str();
if (it->empty())
cs = " "; // empty lines make coin crash, we use a space instead
#if (COIN_MAJOR_VERSION <= 3)
QByteArray latin1str;
latin1str = (QString::fromUtf8(it->c_str())).toLatin1();
latin1str = (QString::fromUtf8(cs)).toLatin1();
pLabel->string.set1Value(index, SbString(latin1str.constData()));
pLabel3d->string.set1Value(index, SbString(latin1str.constData()));
#else
pLabel->string.set1Value(index, SbString(it->c_str()));
pLabel3d->string.set1Value(index, SbString(it->c_str()));
pLabel->string.set1Value(index, SbString(cs));
pLabel3d->string.set1Value(index, SbString(cs));
#endif
index++;
}