summaryrefslogtreecommitdiffstats
path: root/addon
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2013-09-06 18:33:04 (GMT)
committeralbert-github <albert.tests@gmail.com>2013-09-06 18:33:04 (GMT)
commit48676b42611b981c1845c7426f22422b9d94cb13 (patch)
tree84bbf32b57c335d75c10efe0e33d6ca840bc187f /addon
parentec9d0e3753d2197e4138ab717182a20dd6f05f8b (diff)
downloadDoxygen-48676b42611b981c1845c7426f22422b9d94cb13.zip
Doxygen-48676b42611b981c1845c7426f22422b9d94cb13.tar.gz
Doxygen-48676b42611b981c1845c7426f22422b9d94cb13.tar.bz2
Bug 707554 - When I use @INCLUDE DoxyWizard is closed
Current directory was not changed at the right time so the include files could not be found in the "current" directory (i.e. the directory where the Doxyfile resides too, as this directory is shown as the current directory in the doxywizard). This is also important when the doxywizard is started from a shortcut.
Diffstat (limited to 'addon')
-rw-r--r--addon/doxywizard/doxywizard.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/addon/doxywizard/doxywizard.cpp b/addon/doxywizard/doxywizard.cpp
index 11bd8f2..ce764e0 100644
--- a/addon/doxywizard/doxywizard.cpp
+++ b/addon/doxywizard/doxywizard.cpp
@@ -224,9 +224,13 @@ void MainWindow::updateConfigFileName(const QString &fileName)
void MainWindow::loadConfigFromFile(const QString & fileName)
{
- m_expert->loadConfig(fileName);
- m_wizard->refresh();
+ // save full path info of original file
+ QString absFileName = QFileInfo(fileName).absoluteFilePath();
+ // updates the current directory
updateConfigFileName(fileName);
+ // open the specified configuration file
+ m_expert->loadConfig(absFileName);
+ m_wizard->refresh();
updateLaunchButtonState();
m_modified = false;
updateTitle();