diff options
| author | TheKodeToad <TheKodeToad@proton.me> | 2023-08-16 20:46:16 +0100 |
|---|---|---|
| committer | TheKodeToad <TheKodeToad@proton.me> | 2023-08-16 22:23:38 +0100 |
| commit | 3e2733d840d24ce4f46b49bca0b8656d4d6e3d87 (patch) | |
| tree | 386113207514b8071b0122b318c10439259ca83c /launcher/settings/OverrideSetting.cpp | |
| parent | 57430fd189aed592a170d597de61b3acabaaa43d (diff) | |
| parent | c88088c91a92a371a9bc2b7384c2897157772b7e (diff) | |
| download | PrismLauncher-3e2733d840d24ce4f46b49bca0b8656d4d6e3d87.tar.gz PrismLauncher-3e2733d840d24ce4f46b49bca0b8656d4d6e3d87.tar.bz2 PrismLauncher-3e2733d840d24ce4f46b49bca0b8656d4d6e3d87.zip | |
Merge branch 'develop' into better-launch
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
Diffstat (limited to 'launcher/settings/OverrideSetting.cpp')
| -rw-r--r-- | launcher/settings/OverrideSetting.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/launcher/settings/OverrideSetting.cpp b/launcher/settings/OverrideSetting.cpp index 4396a381..fee65b8d 100644 --- a/launcher/settings/OverrideSetting.cpp +++ b/launcher/settings/OverrideSetting.cpp @@ -15,8 +15,7 @@ #include "OverrideSetting.h" -OverrideSetting::OverrideSetting(std::shared_ptr<Setting> other, std::shared_ptr<Setting> gate) - : Setting(other->configKeys(), QVariant()) +OverrideSetting::OverrideSetting(std::shared_ptr<Setting> other, std::shared_ptr<Setting> gate) : Setting(other->configKeys(), QVariant()) { Q_ASSERT(other); Q_ASSERT(gate); @@ -36,8 +35,7 @@ QVariant OverrideSetting::defValue() const QVariant OverrideSetting::get() const { - if(isOverriding()) - { + if (isOverriding()) { return Setting::get(); } return m_other->get(); |