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

Fix crash during multi-object delete

Browse Source
This commit is contained in:
WandererFan
2017-12-23 13:55:33 -05:00
committed by wmayer
parent 98be3a3ff7
commit 553fa64ec4
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Mod/TechDraw/App/DrawPage.cpp
View File

@@ -272,22 +272,36 @@ int DrawPage::addView(App::DocumentObject *docObj)
return Views.getSize();
}
//Note Views might be removed from document elsewhere so need to check if a View is still in Document here
int DrawPage::removeView(App::DocumentObject *docObj)
{
if(!docObj->isDerivedFrom(TechDraw::DrawView::getClassTypeId()))
return -1;
App::Document* doc = docObj->getDocument();
if (doc == nullptr) {
return -1;
}
const char* name = docObj->getNameInDocument();
if (!name) {
return -1;
}
const std::vector<App::DocumentObject*> currViews = Views.getValues();
std::vector<App::DocumentObject*> newViews;
std::vector<App::DocumentObject*>::const_iterator it = currViews.begin();
for (; it != currViews.end(); it++) {
std::string viewName = docObj->getNameInDocument();
App::Document* viewDoc = (*it)->getDocument();
if (viewDoc == nullptr) {
continue;
}
std::string viewName = name;
if (viewName.compare((*it)->getNameInDocument()) != 0) {
newViews.push_back((*it));
}
}
Views.setValues(newViews);
return Views.getSize();
}