Changeset 10805

Timestamp:

11/20/09 12:43:53 (4 years ago)

Author:

robert

Message:

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

Files:

• OpenSceneGraph/trunk/src/osgPlugins/3ds/ReaderWriter3DS.cpp (modified) (1 diff)

OpenSceneGraph/trunk/src/osgPlugins/3ds/ReaderWriter3DS.cpp

@@ -500 +500 @@
     ReaderObject reader;
 
-    reader._directory = options->getDatabasePathList().empty() ? osgDB::getFilePath(fileName) : options->getDatabasePathList().front();
+    reader._directory = ( options && !options->getDatabasePathList().empty() ) ? options->getDatabasePathList().front() : osgDB::getFilePath(fileName);
 
     osg::Group* group = new osg::Group;