summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt/rbutilqt.cpp
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2012-01-06 19:26:56 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2012-01-06 19:26:56 +0000
commitade55fd3d4b29bfe05c9caa182a96a0013b72f75 (patch)
tree26696ac2c506bdb2e88addc555467acb763c0c86 /rbutil/rbutilqt/rbutilqt.cpp
parentbe0e197190c0d4af347c5532b8ab8229279d940e (diff)
downloadrockbox-ade55fd3d4b29bfe05c9caa182a96a0013b72f75.tar.gz
rockbox-ade55fd3d4b29bfe05c9caa182a96a0013b72f75.tar.bz2
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/rbutilqt/rbutilqt.cpp')
-rw-r--r--rbutil/rbutilqt/rbutilqt.cpp6
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)
RegCloseKey(hk);
}
#endif
- updateSettings();
+ updateDevice();
downloadInfo();
m_gotInfo = false;
@@ -347,7 +347,7 @@ void RbUtilQt::updateSettings()
HttpGet::setGlobalCache(RbSettings::value(RbSettings::CachePath).toString());
HttpGet::setGlobalDumbCache(RbSettings::value(RbSettings::CacheOffline).toBool());
- if(RbSettings::value(RbSettings::RbutilVersion) != PUREVERSION) {
+ if(RbSettings::value(RbSettings::RbutilVersion) != PUREVERSION) {
QApplication::processEvents();
QMessageBox::information(this, tr("New installation"),
tr("This is a new installation of Rockbox Utility, or a new version. "
@@ -362,7 +362,7 @@ void RbUtilQt::updateSettings()
"to a changed device path. The configuration dialog will "
"now open to allow you to correct the problem."));
configDialog();
- }
+ }
}