summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2019-05-15 19:20:04 (GMT)
committerGitHub <noreply@github.com>2019-05-15 19:20:04 (GMT)
commit3817370a1ae5aea6bb6653eae48bcb4a7771b863 (patch)
tree03e3aa74982ca182f1ec08e8c1b249ccfbace017
parentfc73eb94348ca6f567334d1c0f08d0f3b860d081 (diff)
parentb19c33eb164e4791c538f426f06f761b97961e64 (diff)
downloadDoxygen-3817370a1ae5aea6bb6653eae48bcb4a7771b863.zip
Doxygen-3817370a1ae5aea6bb6653eae48bcb4a7771b863.tar.gz
Doxygen-3817370a1ae5aea6bb6653eae48bcb4a7771b863.tar.bz2
Merge pull request #6989 from albert-github/feature/bug_htags_filemap
Don't try to load htags filemap in case htags fails
-rw-r--r--src/doxygen.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index dd32a8e..983eeb7 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -11690,7 +11690,7 @@ void generateOutput()
QCString htmldir = Config_getString(HTML_OUTPUT);
if (!Htags::execute(htmldir))
err("USE_HTAGS is YES but htags(1) failed. \n");
- if (!Htags::loadFilemap(htmldir))
+ else if (!Htags::loadFilemap(htmldir))
err("htags(1) ended normally but failed to load the filemap. \n");
}