diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-09-04 02:10:29 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-09-04 02:10:29 +0200 |
| commit | cd108fd02975eac3a3fed2fde26c58de5cbdaf1c (patch) | |
| tree | c19f22573086901238b7feacd9b265d249195700 /logic/settings/SettingsObject.h | |
| parent | 151a0ca11ec658525e151b7130543a364c41a3e8 (diff) | |
| download | MultiMC-cd108fd02975eac3a3fed2fde26c58de5cbdaf1c.tar MultiMC-cd108fd02975eac3a3fed2fde26c58de5cbdaf1c.tar.gz MultiMC-cd108fd02975eac3a3fed2fde26c58de5cbdaf1c.tar.lz MultiMC-cd108fd02975eac3a3fed2fde26c58de5cbdaf1c.tar.xz MultiMC-cd108fd02975eac3a3fed2fde26c58de5cbdaf1c.zip | |
GH-1223 fix override settings
They now work more like passthrough settings, except not passing through set and reset
Diffstat (limited to 'logic/settings/SettingsObject.h')
| -rw-r--r-- | logic/settings/SettingsObject.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/logic/settings/SettingsObject.h b/logic/settings/SettingsObject.h index 6272d24c..0f299c5d 100644 --- a/logic/settings/SettingsObject.h +++ b/logic/settings/SettingsObject.h @@ -62,12 +62,13 @@ public: virtual ~SettingsObject(); /*! * Registers an override setting for the given original setting in this settings object + * gate decides if the passthrough (true) or the original (false) is used for value * * This will fail if there is already a setting with the same ID as * the one that is being registered. * \return A valid Setting shared pointer if successful. */ - std::shared_ptr<Setting> registerOverride(std::shared_ptr<Setting> original); + std::shared_ptr<Setting> registerOverride(std::shared_ptr<Setting> original, std::shared_ptr<Setting> gate); /*! * Registers a passthorugh setting for the given original setting in this settings object |