FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added protection against the Registry from being deleted prior to the proxy objects unregistering themselves

Browse Source
This commit is contained in:
Robert Osfield
2010-12-08 09:54:23 +00:00
parent 1b42084217
commit ebeed76643
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/osgDB/ObjectWrapper.cpp
View File

@@ -265,12 +265,19 @@ RegisterWrapperProxy::RegisterWrapperProxy( osg::Object* proto, const std::strin
{
_wrapper = new ObjectWrapper( proto, name, associates );
if ( func ) (*func)( _wrapper.get() );
Registry::instance()->getObjectWrapperManager()->addWrapper( _wrapper.get() );
if (Registry::instance())
{
Registry::instance()->getObjectWrapperManager()->addWrapper( _wrapper.get() );
}
}
RegisterWrapperProxy::~RegisterWrapperProxy()
{
Registry::instance()->getObjectWrapperManager()->removeWrapper( _wrapper.get() );
if (Registry::instance())
{
Registry::instance()->getObjectWrapperManager()->removeWrapper( _wrapper.get() );
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -609,10 +616,16 @@ RegisterCompressorProxy::RegisterCompressorProxy( const std::string& name, BaseC
_compressor(compressor)
{
_compressor->setName( name );
Registry::instance()->getObjectWrapperManager()->addCompressor( _compressor.get() );
if (Registry::instance())
{
Registry::instance()->getObjectWrapperManager()->addCompressor( _compressor.get() );
}
}
RegisterCompressorProxy::~RegisterCompressorProxy()
{
Registry::instance()->getObjectWrapperManager()->removeCompressor( _compressor.get() );
if (Registry::instance())
{
Registry::instance()->getObjectWrapperManager()->removeCompressor( _compressor.get() );
}
}