FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check for null options before changing path in registry

Browse Source
This commit is contained in:
timoore
2007-12-10 08:30:43 +00:00
parent 3c409c5070
commit e683b5fdec
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/model/ModelRegistry.cxx
+8 -2
View File
@@ -204,8 +204,12 @@ public:
struct OptionsPusher { struct OptionsPusher {
FilePathList localPathList; FilePathList localPathList;
OptionsPusher(const ReaderWriter::Options* options) bool validOptions;
OptionsPusher(const ReaderWriter::Options* options):
validOptions(false)
{ {
if (!options)
return;
Registry* registry = Registry::instance(); Registry* registry = Registry::instance();
localPathList = registry->getDataFilePathList(); localPathList = registry->getDataFilePathList();
const FilePathList& regPathList = registry->getDataFilePathList(); const FilePathList& regPathList = registry->getDataFilePathList();
@@ -219,11 +223,13 @@ struct OptionsPusher {
} }
// Save the current Registry path list and install the augmented one. // Save the current Registry path list and install the augmented one.
localPathList.swap(registry->getDataFilePathList()); localPathList.swap(registry->getDataFilePathList());
validOptions = true;
} }
~OptionsPusher() ~OptionsPusher()
{ {
// Restore the old path list // Restore the old path list
localPathList.swap(Registry::instance()->getDataFilePathList()); if (validOptions)
localPathList.swap(Registry::instance()->getDataFilePathList());
} }
}; };
} // namespace } // namespace