From 7604146d3f9e34cbe23dfc01ba71d2af78e7ece7 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 8 Mar 2006 15:30:07 +0000 Subject: [PATCH] From Farshid Lashkari, "A while back the behaviour of extension alias' was modified so that the user can override existing alias'. The change allowed for circular references, so the createLibraryNameForExtension would get caught in an endless loop. The following fix will catch circular references." --- src/osgDB/Registry.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osgDB/Registry.cpp b/src/osgDB/Registry.cpp index 833abf128..8f07dd3ef 100644 --- a/src/osgDB/Registry.cpp +++ b/src/osgDB/Registry.cpp @@ -469,7 +469,7 @@ std::string Registry::createLibraryNameForExtension(const std::string& ext) { ExtensionAliasMap::iterator itr=_extAliasMap.find(ext); - if (itr!=_extAliasMap.end()) return createLibraryNameForExtension(itr->second); + if (itr!=_extAliasMap.end() && ext != itr->second) return createLibraryNameForExtension(itr->second); #ifdef OSG_JAVA_BUILD static std::string prepend = "java";