gilles/asusctl
1
0
Fork 0
mirror of https://gitlab.com/asus-linux/asusctl.git synced 2026-02-06 00:15:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: fix profile fan modes and creating

Browse Source
This commit is contained in:
Luke D. Jones
2021-05-26 09:24:18 +12:00
parent b2dc610c0b
commit 36bba75c50
7 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "daemon"
version = "3.6.1"
version = "3.6.2"
license = "MPL-2.0"
readme = "README.md"
authors = ["Luke <luke@ljones.dev>"]

24
daemon/src/ctrl_profiles/controller.rs
View File

@@ -69,12 +69,12 @@ impl CtrlFanAndCpu {
}
pub(super) fn set_active(&mut self, profile: &str) -> Result<(), RogError> {
if let Ok(mut cfg) = self.config.clone().try_lock() {
cfg.read();
if let Some(existing) = cfg.power_profiles.get(profile) {
if let Ok(mut config) = self.config.clone().try_lock() {
config.read();
if let Some(existing) = config.power_profiles.get(profile) {
existing.set_system_all()?;
cfg.active_profile = existing.name.clone();
cfg.write();
config.active_profile = existing.name.clone();
config.write();
info!("Profile was changed to: {}", profile);
}
}
@@ -82,18 +82,20 @@ impl CtrlFanAndCpu {
}
pub(super) fn new_or_modify(&mut self, profile: &Profile) -> Result<(), RogError> {
if let Ok(mut cfg) = self.config.clone().try_lock() {
cfg.read();
if let Ok(mut config) = self.config.clone().try_lock() {
config.read();
if let Some(existing) = cfg.power_profiles.get_mut(&profile.name) {
if let Some(existing) = config.power_profiles.get_mut(&profile.name) {
*existing = profile.clone();
existing.set_system_all()?;
} else {
cfg.power_profiles
config.power_profiles
.insert(profile.name.clone(), profile.clone());
profile.set_system_all()?;
}
cfg.active_profile = profile.name.clone();
cfg.write();
config.active_profile = profile.name.clone();
config.write();
}
Ok(())
}