diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2016-06-02 18:34:58 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2016-06-02 18:34:58 (GMT) |
| commit | 7c3126407bbb46717a4e0a09b61ee001702af7bf (patch) | |
| tree | 47fc5a9ad8ce8333ea9cf4d2442da34e4092e4d8 | |
| parent | e629fc64d42121e86bf2230a3b515d1d0d868dcd (diff) | |
| download | Doxygen-7c3126407bbb46717a4e0a09b61ee001702af7bf.zip Doxygen-7c3126407bbb46717a4e0a09b61ee001702af7bf.tar.gz Doxygen-7c3126407bbb46717a4e0a09b61ee001702af7bf.tar.bz2 | |
Fixed problem with -w command when no Doxyfile was present and specified
| -rw-r--r-- | src/doxygen.cpp | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 04a8b57..a2eb53a 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -10258,21 +10258,17 @@ void readConfiguration(int argc, char **argv) } else if (qstricmp(formatName,"html")==0) { + Config::init(); if (optind+4<argc || QFileInfo("Doxyfile").exists()) + // explicit config file mentioned or default found on disk { QCString df = optind+4<argc ? argv[optind+4] : QCString("Doxyfile"); - if (!Config::parse(df)) + if (!Config::parse(df)) // parse the config file { err("error opening or reading configuration file %s!\n",argv[optind+4]); cleanUpDoxygen(); exit(1); } - Config::postProcess(TRUE); - Config::checkAndCorrect(); - } - else - { - Config::init(); } if (optind+3>=argc) { @@ -10280,6 +10276,8 @@ void readConfiguration(int argc, char **argv) cleanUpDoxygen(); exit(1); } + Config::postProcess(TRUE); + Config::checkAndCorrect(); QCString outputLanguage=Config_getEnum(OUTPUT_LANGUAGE); if (!setTranslator(outputLanguage)) @@ -10307,6 +10305,7 @@ void readConfiguration(int argc, char **argv) } else if (qstricmp(formatName,"latex")==0) { + Config::init(); if (optind+4<argc || QFileInfo("Doxyfile").exists()) { QCString df = optind+4<argc ? argv[optind+4] : QCString("Doxyfile"); @@ -10316,12 +10315,6 @@ void readConfiguration(int argc, char **argv) cleanUpDoxygen(); exit(1); } - Config::postProcess(TRUE); - Config::checkAndCorrect(); - } - else // use default config - { - Config::init(); } if (optind+3>=argc) { @@ -10329,6 +10322,8 @@ void readConfiguration(int argc, char **argv) cleanUpDoxygen(); exit(1); } + Config::postProcess(TRUE); + Config::checkAndCorrect(); QCString outputLanguage=Config_getEnum(OUTPUT_LANGUAGE); if (!setTranslator(outputLanguage)) |