Changeset 10805

Show
Ignore:
Timestamp:
11/20/09 12:43:53 (5 years ago)
Author:
robert
Message:

From Colin McDonald?, "Reading from a stream the 3ds plugin crashes if the options are null."

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgPlugins/3ds/ReaderWriter3DS.cpp

    r10076 r10805  
    500500    ReaderObject reader; 
    501501 
    502     reader._directory = options->getDatabasePathList().empty() ? osgDB::getFilePath(fileName) : options->getDatabasePathList().front(); 
     502    reader._directory = ( options && !options->getDatabasePathList().empty() ) ? options->getDatabasePathList().front() : osgDB::getFilePath(fileName); 
    503503 
    504504    osg::Group* group = new osg::Group;