CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-1223 fix override settings

Browse Source 
They now work more like passthrough settings, except not passing through set and reset
This commit is contained in:
Petr Mrázek
2015-09-04 02:10:29 +02:00
parent 151a0ca11e
commit cd108fd029
8 changed files with 88 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
logic/settings/SettingsObject.cpp
View File

@ -30,7 +30,8 @@ SettingsObject::~SettingsObject()
m_settings.clear();
}
std::shared_ptr<Setting> SettingsObject::registerOverride(std::shared_ptr<Setting> original)
std::shared_ptr<Setting> SettingsObject::registerOverride(std::shared_ptr<Setting> original,
std::shared_ptr<Setting> gate)
{
if (contains(original->id()))
{
@ -38,7 +39,7 @@ std::shared_ptr<Setting> SettingsObject::registerOverride(std::shared_ptr<Settin
.arg(original->id());
return nullptr; // Fail
}
auto override = std::make_shared<OverrideSetting>(original);
auto override = std::make_shared<OverrideSetting>(original, gate);
override->m_storage = this;
connectSignals(*override);
m_settings.insert(override->id(), override);