len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-11 06:05:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Respect default values for ServerSettingsList as well. No idea why I missed that.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24326 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2010-01-24 19:24:56 +00:00
parent 52a7626bbc
commit 12dd944d9b
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
rbutil/rbutilqt/base/rbsettings.cpp
View file

@ -111,6 +111,7 @@ const static struct {
//! pointer to setting object to NULL //! pointer to setting object to NULL
QSettings* RbSettings::systemSettings = NULL; QSettings* RbSettings::systemSettings = NULL;
QSettings* RbSettings::userSettings = NULL; QSettings* RbSettings::userSettings = NULL;
//! global volatile settings
QMap<QString, QVariant> RbSettings::serverSettings; QMap<QString, QVariant> RbSettings::serverSettings;
void RbSettings::ensureRbSettingsExists() void RbSettings::ensureRbSettingsExists()
@ -225,8 +226,12 @@ QVariant RbSettings::value(enum ServerSettings setting)
i++; i++;
QString s = constructSettingPath(ServerSettingsList[i].name); QString s = constructSettingPath(ServerSettingsList[i].name);
qDebug() << "[Settings] GET SERV:" << s << serverSettings.value(s, ServerSettingsList[i].def).toString(); qDebug() << "[Settings] GET SERV:" << s
return serverSettings.value(s); << serverSettings.value(s, ServerSettingsList[i].def).toString();
if(serverSettings.contains(s))
return serverSettings.value(s);
else
return ServerSettingsList[i].def;
} }
void RbSettings::setValue(enum UserSettings setting , QVariant value) void RbSettings::setValue(enum UserSettings setting , QVariant value)

1
rbutil/rbutilqt/base/rbsettings.h
View file

@ -151,6 +151,7 @@ class RbSettings : public QObject
//! pointers to our setting objects //! pointers to our setting objects
static QSettings *systemSettings; static QSettings *systemSettings;
static QSettings *userSettings; static QSettings *userSettings;
//! global volatile settings
static QMap<QString, QVariant> serverSettings; static QMap<QString, QVariant> serverSettings;
}; };