From ec55313c2824fe9807c710dbb37374d9dd98715e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Sat, 7 Oct 2017 16:09:14 +0200 Subject: [PATCH] GUI: DataDir - use application path if datadir is not set --- gui/mainwindow.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index 215183aa9..c394d6258 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -49,6 +49,12 @@ static const QString OnlineHelpURL("http://cppcheck.net/manual.html"); static const QString compile_commands_json("compile_commands.json"); +static QString getDataDir(const QSettings *settings) { + const QString dataDir = settings->value("DATADIR", QString()).toString(); + const QString appPath = QFileInfo(QCoreApplication::applicationFilePath()).canonicalPath(); + return dataDir.isEmpty() ? appPath : dataDir; +} + MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) : mSettings(settings), mApplications(new ApplicationList(this)), @@ -64,7 +70,7 @@ MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) : { mUI.setupUi(this); mThread = new ThreadHandler(this); - mThread->setDataDir(mSettings->value("DATADIR", QString()).toString()); + mThread->setDataDir(getDataDir(settings)); mUI.mResults->initialize(mSettings, mApplications, mThread); // Filter timer to delay filtering results slightly while typing