From b0b1f44ae125dbaf8d887a6a3ec457b2c984497f Mon Sep 17 00:00:00 2001 From: Vasily Date: Mon, 2 Dec 2019 18:23:34 +0100 Subject: [PATCH] Remove color*New from settings The color*New settings were a hotfix for 4.0.1 where wrong settings were applied to the colors leading to a black headset screen. The New postfix is to manually prevent the settings file from reading the old values. --- src/settings/settings.h | 3 --- src/settings/settings_controller.h | 14 +------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/settings/settings.h b/src/settings/settings.h index 00e03d7..993d2ea 100644 --- a/src/settings/settings.h +++ b/src/settings/settings.h @@ -65,9 +65,6 @@ enum class DoubleSetting VIDEO_colorRed, VIDEO_colorGreen, VIDEO_colorBlue, - VIDEO_colorRedNew, - VIDEO_colorGreenNew, - VIDEO_colorBlueNew, CHAPERONE_switchToBeginnerDistance, CHAPERONE_hapticFeedbackDistance, diff --git a/src/settings/settings_controller.h b/src/settings/settings_controller.h index 98d65ed..5d096a0 100644 --- a/src/settings/settings_controller.h +++ b/src/settings/settings_controller.h @@ -344,22 +344,10 @@ private: QtInfo{ "colorRedNew" }, 1.0 }, DoubleSettingValue{ DoubleSetting::VIDEO_colorGreen, - SettingCategory::Video, - QtInfo{ "colorGreen" }, - 1.0 }, - DoubleSettingValue{ DoubleSetting::VIDEO_colorBlue, - SettingCategory::Video, - QtInfo{ "colorBlue" }, - 1.0 }, - DoubleSettingValue{ DoubleSetting::VIDEO_colorRedNew, - SettingCategory::Video, - QtInfo{ "colorRedNew" }, - 1.0 }, - DoubleSettingValue{ DoubleSetting::VIDEO_colorGreenNew, SettingCategory::Video, QtInfo{ "colorGreenNew" }, 1.0 }, - DoubleSettingValue{ DoubleSetting::VIDEO_colorBlueNew, + DoubleSettingValue{ DoubleSetting::VIDEO_colorBlue, SettingCategory::Video, QtInfo{ "colorBlueNew" }, 1.0 },