diff options
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r-- | rbutil/rbutilqt/main.cpp | 6 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/rbutil/rbutilqt/main.cpp b/rbutil/rbutilqt/main.cpp index 39dd3d0735..d9c1b32e2e 100644 --- a/rbutil/rbutilqt/main.cpp +++ b/rbutil/rbutilqt/main.cpp | |||
@@ -25,12 +25,12 @@ | |||
25 | int main( int argc, char ** argv ) { | 25 | int main( int argc, char ** argv ) { |
26 | QApplication app( argc, argv ); | 26 | QApplication app( argc, argv ); |
27 | 27 | ||
28 | QString absolutePath = QFileInfo(qApp->arguments().at(0)).absolutePath() + "/"; | 28 | QString absolutePath = qApp->applicationDirPath(); |
29 | // portable installation: | 29 | // portable installation: |
30 | // check for a configuration file in the program folder. | 30 | // check for a configuration file in the program folder. |
31 | QSettings *user; | 31 | QSettings *user; |
32 | if(QFileInfo(absolutePath + "RockboxUtility.ini").isFile()) | 32 | if(QFileInfo(absolutePath + "/RockboxUtility.ini").isFile()) |
33 | user = new QSettings(absolutePath + "RockboxUtility.ini", QSettings::IniFormat, 0); | 33 | user = new QSettings(absolutePath + "/RockboxUtility.ini", QSettings::IniFormat, 0); |
34 | else user = new QSettings(QSettings::IniFormat, QSettings::UserScope, "rockbox.org", "RockboxUtility"); | 34 | else user = new QSettings(QSettings::IniFormat, QSettings::UserScope, "rockbox.org", "RockboxUtility"); |
35 | 35 | ||
36 | QTranslator translator; | 36 | QTranslator translator; |
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 | } |