[Project64] Some code refactoring to CSettingTypeApplication

project64 · Mar 28, 2018 · 88a824b · 88a824b
1 parent 9e92381
commit 88a824b
Showing 1 changed file with 3 additions and 24 deletions.
diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-Application.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-Application.cpp
@@ -170,14 +170,7 @@ bool CSettingTypeApplication::Load(uint32_t /*Index*/, uint32_t & Value) const
     bool bRes = m_SettingsIniFile->GetNumber(SectionName(), m_KeyNameIdex.c_str(), Value, Value);
     if (!bRes && m_DefaultSetting != Default_None)
     {
-        if (m_DefaultSetting == Default_Constant)
-        {
-            Value = m_DefaultValue;
-        }
-        else
-        {
-            g_Settings->LoadDword(m_DefaultSetting, Value);
-        }
+        Value = m_DefaultSetting == Default_Constant ? m_DefaultValue: g_Settings->LoadDword(m_DefaultSetting);
     }
     return bRes;
 }
@@ -217,29 +210,15 @@ void CSettingTypeApplication::LoadDefault(uint32_t /*Index*/, uint32_t & Value)
 {
     if (m_DefaultSetting != Default_None)
     {
-        if (m_DefaultSetting == Default_Constant)
-        {
-            Value = m_DefaultValue;
-        }
-        else
-        {
-            g_Settings->LoadDword(m_DefaultSetting, Value);
-        }
+        Value = m_DefaultSetting == Default_Constant ? m_DefaultValue : g_Settings->LoadDword(m_DefaultSetting);
     }
 }
 
 void CSettingTypeApplication::LoadDefault(uint32_t /*Index*/, std::string & Value) const
 {
     if (m_DefaultSetting != Default_None)
     {
-        if (m_DefaultSetting == Default_Constant)
-        {
-            Value = m_DefaultStr;
-        }
-        else
-        {
-            g_Settings->LoadStringVal(m_DefaultSetting, Value);
-        }
+        Value = m_DefaultSetting == Default_Constant ? m_DefaultStr : g_Settings->LoadStringVal(m_DefaultSetting);
     }
 }