From 7f05605c16a652237fb93a0c7b3f4ecc4b9ac440 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 13 Jun 2011 15:20:48 +0000 Subject: [PATCH] Fixed wild card search when wild card filename includes a path. --- src/osgDB/FileUtils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osgDB/FileUtils.cpp b/src/osgDB/FileUtils.cpp index 2ebeea6d9..f5693e673 100644 --- a/src/osgDB/FileUtils.cpp +++ b/src/osgDB/FileUtils.cpp @@ -555,7 +555,7 @@ osgDB::DirectoryContents osgDB::expandWildcardsInFilename(const std::string& fil osgDB::DirectoryContents contents; std::string dir = osgDB::getFilePath(filename); - std::string filenameOnly = filename.substr(dir.length(), std::string::npos); + std::string filenameOnly = dir.empty() ? filename : filename.substr(dir.length()+1, std::string::npos); std::string left = filenameOnly.substr(0, filenameOnly.find('*')); std::string right = filenameOnly.substr(filenameOnly.find('*')+1, std::string::npos);