From 317edd72cc317387f8ac010a9ec772d4bfdfdbb6 Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Mon, 2 Oct 2023 17:09:29 -0700
Subject: [PATCH] Fix color24 (#353)

* fix color24 saving

* clang format
---
 src/config/ConsoleVariable.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/config/ConsoleVariable.cpp b/src/config/ConsoleVariable.cpp
index 670d893..ee044e5 100644
--- a/src/config/ConsoleVariable.cpp
+++ b/src/config/ConsoleVariable.cpp
@@ -186,12 +186,17 @@ void ConsoleVariable::Save() {
         } else if (variable.second->Type == ConsoleVariableType::Color ||
                    variable.second->Type == ConsoleVariableType::Color24) {
             auto keyStr = key.c_str();
-            Color_RGBA8 clr = variable.second->Color;
-            conf->SetUInt(StringHelper::Sprintf("%s.R", keyStr), clr.r);
-            conf->SetUInt(StringHelper::Sprintf("%s.G", keyStr), clr.g);
-            conf->SetUInt(StringHelper::Sprintf("%s.B", keyStr), clr.b);
+            conf->SetUInt(StringHelper::Sprintf("%s.R", keyStr), variable.second->Type == ConsoleVariableType::Color
+                                                                     ? variable.second->Color.r
+                                                                     : variable.second->Color24.r);
+            conf->SetUInt(StringHelper::Sprintf("%s.G", keyStr), variable.second->Type == ConsoleVariableType::Color
+                                                                     ? variable.second->Color.g
+                                                                     : variable.second->Color24.g);
+            conf->SetUInt(StringHelper::Sprintf("%s.B", keyStr), variable.second->Type == ConsoleVariableType::Color
+                                                                     ? variable.second->Color.b
+                                                                     : variable.second->Color24.b);
             if (variable.second->Type == ConsoleVariableType::Color) {
-                conf->SetUInt(StringHelper::Sprintf("%s.A", keyStr), clr.a);
+                conf->SetUInt(StringHelper::Sprintf("%s.A", keyStr), variable.second->Color.a);
                 conf->SetString(StringHelper::Sprintf("%s.Type", keyStr), "RGBA");
             } else {
                 conf->SetString(StringHelper::Sprintf("%s.Type", keyStr), "RGB");