summaryrefslogtreecommitdiffstats
path: root/src/config.l
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2011-12-03 18:14:19 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2011-12-03 18:14:19 (GMT)
commite48f695c385ccc356e124ac3a851a6228f4f5b84 (patch)
tree018e8f5de990aedc2ea2b98065d07bc92253a8f1 /src/config.l
parent645cc7c6f75bdad11ceb129d135b5b01f34c3212 (diff)
downloadDoxygen-e48f695c385ccc356e124ac3a851a6228f4f5b84.zip
Doxygen-e48f695c385ccc356e124ac3a851a6228f4f5b84.tar.gz
Doxygen-e48f695c385ccc356e124ac3a851a6228f4f5b84.tar.bz2
Release-1.7.6
Diffstat (limited to 'src/config.l')
-rw-r--r--src/config.l24
1 files changed, 16 insertions, 8 deletions
diff --git a/src/config.l b/src/config.l
index 7d3f633..3c22571 100644
--- a/src/config.l
+++ b/src/config.l
@@ -1223,20 +1223,28 @@ void Config::check()
QCString &dotPath = Config_getString("DOT_PATH");
if (!dotPath.isEmpty())
{
- QFileInfo dp(dotPath+"/dot"+portable_commandExtension());
- if (!dp.exists() || !dp.isFile())
+ QFileInfo fi(dotPath);
+ if (fi.exists() && fi.isFile()) // user specified path + exec
{
- config_err("warning: the dot tool could not be found at %s\n",dotPath.data());
- dotPath="";
+ dotPath=fi.dirPath(TRUE);
}
else
{
- dotPath=dp.dirPath(TRUE)+"/";
+ QFileInfo dp(dotPath+"/dot"+portable_commandExtension());
+ if (!dp.exists() || !dp.isFile())
+ {
+ config_err("warning: the dot tool could not be found at %s\n",dotPath.data());
+ dotPath="";
+ }
+ else
+ {
+ dotPath=dp.dirPath(TRUE)+"/";
+ }
+ }
#if defined(_WIN32) // convert slashes
- uint i=0,l=dotPath.length();
- for (i=0;i<l;i++) if (dotPath.at(i)=='/') dotPath.at(i)='\\';
+ uint i=0,l=dotPath.length();
+ for (i=0;i<l;i++) if (dotPath.at(i)=='/') dotPath.at(i)='\\';
#endif
- }
}
else // make sure the string is empty but not null!
{