From e95986b83093c9049bbcc1ddb8578d8adb6a07d4 Mon Sep 17 00:00:00 2001
From: "Luke D. Jones" <luke@ljones.dev>
Date: Fri, 24 Jun 2022 23:12:04 +1200
Subject: [PATCH] Update changelog

---
 CHANGELOG.md                 |  4 ++++
 daemon/src/ctrl_anime/mod.rs | 23 ++++++++++++-----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82311efe..5c2050f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased ]
 
+### Changed
+- Refactor LED and AniMe tasks
+- Reload keyboard brightness on resume from sleep/hiber
+
 ## [4.1.1] - 2022-06-21
 ### Changed
 - Fixes to anime matrix system thread cancelation
diff --git a/daemon/src/ctrl_anime/mod.rs b/daemon/src/ctrl_anime/mod.rs
index baad79a4..fef33c46 100644
--- a/daemon/src/ctrl_anime/mod.rs
+++ b/daemon/src/ctrl_anime/mod.rs
@@ -319,15 +319,16 @@ impl crate::CtrlTask for CtrlAnimeTask {
             .await
             .expect("CtrlAnimeTask could not create ManagerProxy");
 
-        let load_save = |start: bool, lock: MutexGuard<CtrlAnime>, inner: Arc<Mutex<CtrlAnime>>| {
-            if start {
-                info!("CtrlAnimeTask running sleep animation");
-                CtrlAnime::run_thread(inner.clone(), lock.cache.shutdown.clone(), true);
-            } else {
-                info!("CtrlAnimeTask running wake animation");
-                CtrlAnime::run_thread(inner.clone(), lock.cache.wake.clone(), true);
-            }
-        };
+        let run_action =
+            |start: bool, lock: MutexGuard<CtrlAnime>, inner: Arc<Mutex<CtrlAnime>>| {
+                if start {
+                    info!("CtrlAnimeTask running sleep animation");
+                    CtrlAnime::run_thread(inner.clone(), lock.cache.shutdown.clone(), true);
+                } else {
+                    info!("CtrlAnimeTask running wake animation");
+                    CtrlAnime::run_thread(inner.clone(), lock.cache.wake.clone(), true);
+                }
+            };
 
         let inner = self.inner.clone();
         executor
@@ -340,7 +341,7 @@ impl crate::CtrlTask for CtrlAnimeTask {
                                 // other threads - it is possible to end up with deadlocks otherwise.
                                 loop {
                                     if let Ok(lock) = inner.clone().try_lock() {
-                                        load_save(args.start, lock, inner.clone());
+                                        run_action(args.start, lock, inner.clone());
                                         break;
                                     }
                                 }
@@ -364,7 +365,7 @@ impl crate::CtrlTask for CtrlAnimeTask {
                             if let Ok(args) = event.args() {
                                 loop {
                                     if let Ok(lock) = inner.clone().try_lock() {
-                                        load_save(args.start, lock, inner.clone());
+                                        run_action(args.start, lock, inner.clone());
                                     }
                                 }
                             }