iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Construct a new config object, rather than changing group, to avoid any race conditions.

Browse Source 
BUG: 600
This commit is contained in:
craig.p.drummond
2014-12-03 19:11:05 +00:00
parent d926b10c68
commit 22fc168a13
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -32,6 +32,8 @@
'Replace Play Queue' is used.
14. Only show output change notification if outputs menu was not previously
empty.
15. Construct a new config object, rather than changing group, to avoid any
race conditions.
1.5.1
-----

38
gui/settings.cpp
View File

@@ -170,14 +170,14 @@ MPDConnectionDetails Settings::connectionDetails(const QString &name)
n=MPDConnectionDetails::configGroupName(details.name);
}
if (cfg.hasGroup(n)) {
cfg.beginGroup(n);
details.hostname=cfg.get("host", name.isEmpty() ? mpdDefaults.host : QString());
details.port=cfg.get("port", name.isEmpty() ? mpdDefaults.port : 6600);
details.dir=cfg.getDirPath("dir", name.isEmpty() ? mpdDefaults.dir : "/var/lib/mpd/music");
details.topLevel=cfg.get("topLevel", QString());
Configuration grp(n);
details.hostname=grp.get("host", name.isEmpty() ? mpdDefaults.host : QString());
details.port=grp.get("port", name.isEmpty() ? mpdDefaults.port : 6600);
details.dir=grp.getDirPath("dir", name.isEmpty() ? mpdDefaults.dir : "/var/lib/mpd/music");
details.topLevel=grp.get("topLevel", QString());
#if defined ENABLE_KDE_SUPPORT && defined ENABLE_KWALLET
if (KWallet::Wallet::isEnabled()) {
if (cfg.get("passwd", false)) {
if (grp.get("passwd", false)) {
if (openWallet()) {
wallet->readPassword(name.isEmpty() ? "mpd" : name, details.password);
}
@@ -186,12 +186,11 @@ MPDConnectionDetails Settings::connectionDetails(const QString &name)
}
} else
#endif // ENABLE_KWALLET
details.password=cfg.get("passwd", name.isEmpty() ? mpdDefaults.passwd : QString());
details.coverName=cfg.get("coverName", QString());
details.password=grp.get("passwd", name.isEmpty() ? mpdDefaults.passwd : QString());
details.coverName=grp.get("coverName", QString());
#ifdef ENABLE_HTTP_STREAM_PLAYBACK
details.streamUrl=cfg.get("streamUrl", QString());
details.streamUrl=grp.get("streamUrl", QString());
#endif
cfg.endGroup();
} else {
details.hostname=mpdDefaults.host;
details.port=mpdDefaults.port;
@@ -882,14 +881,14 @@ void Settings::saveConnectionDetails(const MPDConnectionDetails &v)
QString n=MPDConnectionDetails::configGroupName(v.name);
cfg.beginGroup(n);
cfg.set("host", v.hostname);
cfg.set("port", (int)v.port);
cfg.setDirPath("dir", v.dir);
cfg.set("topLevel", v.topLevel);
Configuration grp(n);
grp.set("host", v.hostname);
grp.set("port", (int)v.port);
grp.setDirPath("dir", v.dir);
grp.set("topLevel", v.topLevel);
#if defined ENABLE_KDE_SUPPORT && defined ENABLE_KWALLET
if (KWallet::Wallet::isEnabled()) {
cfg.set("passwd", !v.password.isEmpty());
grp.set("passwd", !v.password.isEmpty());
QString walletEntry=v.name.isEmpty() ? "mpd" : v.name;
if (v.password.isEmpty()) {
if (wallet) {
@@ -901,12 +900,11 @@ void Settings::saveConnectionDetails(const MPDConnectionDetails &v)
}
} else
#endif // ENABLE_KWALLET
cfg.set("passwd", v.password);
cfg.set("coverName", v.coverName);
grp.set("passwd", v.password);
grp.set("coverName", v.coverName);
#ifdef ENABLE_HTTP_STREAM_PLAYBACK
cfg.set("streamUrl", v.streamUrl);
grp.set("streamUrl", v.streamUrl);
#endif
cfg.endGroup();
}
void Settings::saveCurrentConnection(const QString &v)