From 7c3126407bbb46717a4e0a09b61ee001702af7bf Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <dimitri@stack.nl>
Date: Thu, 2 Jun 2016 20:34:58 +0200
Subject: Fixed problem with -w command when no Doxyfile was present and
 specified

---
 src/doxygen.cpp | 21 ++++++++-------------
 1 file 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))
-- 
cgit v0.12