diff --git a/src/config/types.rs b/src/config/types.rs index 5d7e59e..fa20c36 100644 --- a/src/config/types.rs +++ b/src/config/types.rs @@ -50,7 +50,7 @@ pub struct ProfileConfig { pub min_freq_mhz: Option, pub max_freq_mhz: Option, pub platform_profile: Option, - pub turbo_auto_settings: Option, + pub turbo_auto_settings: TurboAutoSettings, pub enable_auto_turbo: bool, #[serde(skip_serializing_if = "Option::is_none")] pub battery_charge_thresholds: Option, @@ -66,7 +66,7 @@ impl Default for ProfileConfig { min_freq_mhz: None, // no override max_freq_mhz: None, // no override platform_profile: None, // no override - turbo_auto_settings: Some(TurboAutoSettings::default()), + turbo_auto_settings: TurboAutoSettings::default(), enable_auto_turbo: default_enable_auto_turbo(), battery_charge_thresholds: None, } @@ -224,7 +224,7 @@ impl From for ProfileConfig { platform_profile: toml_config.platform_profile, turbo_auto_settings: toml_config .turbo_auto_settings - .or_else(|| Some(TurboAutoSettings::default())), + .unwrap_or_default(), enable_auto_turbo: toml_config.enable_auto_turbo, battery_charge_thresholds: toml_config.battery_charge_thresholds, } diff --git a/src/engine.rs b/src/engine.rs index 32bdd0c..f5ba279 100644 --- a/src/engine.rs +++ b/src/engine.rs @@ -290,8 +290,8 @@ fn manage_auto_turbo( config: &ProfileConfig, on_ac_power: bool, ) -> Result<(), EngineError> { - // Get the auto turbo settings from the config, or use defaults - let turbo_settings = config.turbo_auto_settings.clone().unwrap_or_default(); + // Get the auto turbo settings from the config + let turbo_settings = config.turbo_auto_settings.clone(); // Validate the complete configuration to ensure it's usable validate_turbo_auto_settings(&turbo_settings)?;