Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/mythtv/libs/libmythbase/mythdb.cpp b/mythtv/libs/libmythbase/mythdb.cpp
- index 2ab7962..ea30783 100644
- --- a/mythtv/libs/libmythbase/mythdb.cpp
- +++ b/mythtv/libs/libmythbase/mythdb.cpp
- @@ -452,18 +452,15 @@ bool MythDB::GetSettings(QMap<QString,QString> &_key_value_pairs)
- }
- }
- }
- - else
- + for (; kvit != _key_value_pairs.end(); ++dit, ++kvit)
- {
- - for (; kvit != _key_value_pairs.end(); ++dit, ++kvit)
- + SettingsMap::const_iterator it =
- + d->overriddenSettings.find(dit.key());
- + if (it != d->overriddenSettings.end())
- {
- - SettingsMap::const_iterator it =
- - d->overriddenSettings.find(dit.key());
- - if (it != d->overriddenSettings.end())
- - {
- - *kvit = *it;
- - *dit = true;
- - done_cnt++;
- - }
- + *kvit = *it;
- + *dit = true;
- + done_cnt++;
- }
- }
- d->settingsCacheLock.unlock();
- @@ -605,15 +602,12 @@ QString MythDB::GetSettingOnHost(const QString &_key, const QString &_host,
- return value;
- }
- }
- - else
- + SettingsMap::const_iterator it = d->overriddenSettings.find(myKey);
- + if (it != d->overriddenSettings.end())
- {
- - SettingsMap::const_iterator it = d->overriddenSettings.find(myKey);
- - if (it != d->overriddenSettings.end())
- - {
- - value = *it;
- - d->settingsCacheLock.unlock();
- - return value;
- - }
- + value = *it;
- + d->settingsCacheLock.unlock();
- + return value;
- }
- d->settingsCacheLock.unlock();
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement