diff options
Diffstat (limited to 'rbutil/rbutilqt/rbutilqt.cpp')
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index def0e15e47..35b227f6e1 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -36,10 +36,9 @@ | |||
36 | 36 | ||
37 | RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent) | 37 | RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent) |
38 | { | 38 | { |
39 | QString programPath = qApp->arguments().at(0); | 39 | absolutePath = qApp->applicationDirPath(); |
40 | absolutePath = QFileInfo(programPath).absolutePath() + "/"; | ||
41 | // use built-in rbutil.ini if no external file in binary folder | 40 | // use built-in rbutil.ini if no external file in binary folder |
42 | QString iniFile = absolutePath + "rbutil.ini"; | 41 | QString iniFile = absolutePath + "/rbutil.ini"; |
43 | if(QFileInfo(iniFile).isFile()) { | 42 | if(QFileInfo(iniFile).isFile()) { |
44 | qDebug() << "using external rbutil.ini"; | 43 | qDebug() << "using external rbutil.ini"; |
45 | devices = new QSettings(iniFile, QSettings::IniFormat, 0); | 44 | devices = new QSettings(iniFile, QSettings::IniFormat, 0); |
@@ -54,9 +53,9 @@ RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent) | |||
54 | // portable installation: | 53 | // portable installation: |
55 | // check for a configuration file in the program folder. | 54 | // check for a configuration file in the program folder. |
56 | QFileInfo config; | 55 | QFileInfo config; |
57 | config.setFile(absolutePath + "RockboxUtility.ini"); | 56 | config.setFile(absolutePath + "/RockboxUtility.ini"); |
58 | if(config.isFile()) { | 57 | if(config.isFile()) { |
59 | userSettings = new QSettings(absolutePath + "RockboxUtility.ini", | 58 | userSettings = new QSettings(absolutePath + "/RockboxUtility.ini", |
60 | QSettings::IniFormat, 0); | 59 | QSettings::IniFormat, 0); |
61 | qDebug() << "config: portable"; | 60 | qDebug() << "config: portable"; |
62 | } | 61 | } |