TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 18:31:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

prevent crash on exit

Browse Source
This commit is contained in:
David Rose 2005-03-15 00:17:55 +00:00
parent ff6b6dad89
commit 1058f0fa68
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
panda/src/gobj/qpgeomMunger.cxx
View File

@ -66,12 +66,16 @@ remove_format(const qpGeomVertexFormat *format) {
fi = _formats.find(format); fi = _formats.find(format);
nassertv(fi != _formats.end()); nassertv(fi != _formats.end());
CPT(qpGeomVertexFormat) derived_format = (*fi).second; // We can't save this in a CPT, because it might be the same pointer
// as format, which might be in the middle of its destructor.
// Putting it in a CPT would bump up its reference count again, and
// end up calling the destructor twice.
const qpGeomVertexFormat *derived_format = (*fi).second;
_formats.erase(fi); _formats.erase(fi);
// We need to unref the derived format, if we reffed it earlier. // We need to unref the derived format, if we reffed it earlier.
if (derived_format != format) { if (derived_format != format) {
derived_format->unref(); unref_delete(derived_format);
} }
} }
@ -141,6 +145,7 @@ do_munge_format(const qpGeomVertexFormat *format) {
{ {
qpGeomVertexFormat *f = (qpGeomVertexFormat *)format; qpGeomVertexFormat *f = (qpGeomVertexFormat *)format;
MutexHolder holder(f->_cache_lock); MutexHolder holder(f->_cache_lock);
nassertr(f->is_registered(), NULL);
inserted = f->_mungers.insert(this).second; inserted = f->_mungers.insert(this).second;
nassertr(inserted, NULL); nassertr(inserted, NULL);
} }

1
panda/src/gobj/qpgeomVertexFormat.cxx
View File

@ -84,6 +84,7 @@ qpGeomVertexFormat::
if (is_registered()) { if (is_registered()) {
get_registry()->unregister_format(this); get_registry()->unregister_format(this);
} }
nassertv(_mungers.empty()); nassertv(_mungers.empty());
} }