Show
Ignore:
Timestamp:
02/26/10 10:23:28 (5 years ago)
Author:
robert
Message:

From Ryan Kawicki, "I guess I missed these during my testing, but if the database pager has outstanding requests while the application is shutting down, the archive can become invalidated through unsafe calls to ReaderWriterTXP::getArchive. I've made this function return a ref_ptr and change other locations to as needed to conform to the change. I've tested this and no more crashes.

Following files from revision 11057 have been attached."

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgPlugins/txp/ReaderWriterTXP.h

    r11037 r11122  
    8282    ReadResult local_readNode(const std::string& file, const osgDB::ReaderWriter::Options* options); 
    8383 
    84     TXPArchive *getArchive(int id, const std::string&); 
     84    osg::ref_ptr< TXPArchive > getArchive(int id, const std::string&); 
    8585  
    8686    osg::Node* getTileContent(const TXPArchive::TileInfo &info, int x, int y, int lod, TXPArchive* archive,  std::vector<TXPArchive::TileLocationInfo>& childrenLoc);