summaryrefslogtreecommitdiff
path: root/src/parsersettings.cc
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2012-08-18 16:49:01 (GMT)
committerMarius Kintel <marius@kintel.net>2012-08-18 16:49:01 (GMT)
commit13d56f492560dc8bc9ed60d1d0b81cc98b2fd0c0 (patch)
treefd13025fa99c2cf2185af00f31dbaca245c9d88c /src/parsersettings.cc
parentd3a53dd546358da51f15fa2fb7d24919235d3256 (diff)
parent47a06c074fa6321224d5c6d6cc85bf9336fb8765 (diff)
Merge pull request #179 from openscad/issue176
fix issue #176
Diffstat (limited to 'src/parsersettings.cc')
-rw-r--r--src/parsersettings.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/parsersettings.cc b/src/parsersettings.cc
index 53b34f4..9409add 100644
--- a/src/parsersettings.cc
+++ b/src/parsersettings.cc
@@ -15,13 +15,13 @@ void add_librarydir(const std::string &libdir)
/*!
Searces for the given file in library paths and returns the full path if found.
- Returns an empty path if file cannot be found.
+ Returns an empty path if file cannot be found or filename is a directory.
*/
std::string locate_file(const std::string &filename)
{
BOOST_FOREACH(const std::string &dir, librarypath) {
fs::path usepath = fs::path(dir) / filename;
- if (fs::exists(usepath)) return usepath.string();
+ if (fs::exists(usepath) && !fs::is_directory(usepath)) return usepath.string();
}
return std::string();
}
contact: Jan Huwald // Impressum