diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-01-06 19:26:56 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-01-06 19:26:56 +0000 |
commit | ade55fd3d4b29bfe05c9caa182a96a0013b72f75 (patch) | |
tree | 26696ac2c506bdb2e88addc555467acb763c0c86 /rbutil | |
parent | be0e197190c0d4af347c5532b8ab8229279d940e (diff) | |
download | rockbox-ade55fd3d4b29bfe05c9caa182a96a0013b72f75.tar.gz rockbox-ade55fd3d4b29bfe05c9caa182a96a0013b72f75.zip |
Fix "invalid settings" dialog appearing twice.
Instead of checking the settings on startup set only the device display.
Otherwise the settings are checked directly on startup and after finishing the
build information download, which leads to the configuration dialog getting
opened twice.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31593 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil')
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index bf4aa1c2e8..403d13a760 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -107,7 +107,7 @@ RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent) | |||
107 | RegCloseKey(hk); | 107 | RegCloseKey(hk); |
108 | } | 108 | } |
109 | #endif | 109 | #endif |
110 | updateSettings(); | 110 | updateDevice(); |
111 | downloadInfo(); | 111 | downloadInfo(); |
112 | 112 | ||
113 | m_gotInfo = false; | 113 | m_gotInfo = false; |
@@ -347,7 +347,7 @@ void RbUtilQt::updateSettings() | |||
347 | HttpGet::setGlobalCache(RbSettings::value(RbSettings::CachePath).toString()); | 347 | HttpGet::setGlobalCache(RbSettings::value(RbSettings::CachePath).toString()); |
348 | HttpGet::setGlobalDumbCache(RbSettings::value(RbSettings::CacheOffline).toBool()); | 348 | HttpGet::setGlobalDumbCache(RbSettings::value(RbSettings::CacheOffline).toBool()); |
349 | 349 | ||
350 | if(RbSettings::value(RbSettings::RbutilVersion) != PUREVERSION) { | 350 | if(RbSettings::value(RbSettings::RbutilVersion) != PUREVERSION) { |
351 | QApplication::processEvents(); | 351 | QApplication::processEvents(); |
352 | QMessageBox::information(this, tr("New installation"), | 352 | QMessageBox::information(this, tr("New installation"), |
353 | tr("This is a new installation of Rockbox Utility, or a new version. " | 353 | tr("This is a new installation of Rockbox Utility, or a new version. " |
@@ -362,7 +362,7 @@ void RbUtilQt::updateSettings() | |||
362 | "to a changed device path. The configuration dialog will " | 362 | "to a changed device path. The configuration dialog will " |
363 | "now open to allow you to correct the problem.")); | 363 | "now open to allow you to correct the problem.")); |
364 | configDialog(); | 364 | configDialog(); |
365 | } | 365 | } |
366 | } | 366 | } |
367 | 367 | ||
368 | 368 | ||