Adjust how thread exit is handled for anime controller

2026-02-06 00:15:04 +01:00 · 2022-06-20 22:43:12 +12:00
parent 2ee7fc9910
commit 13a90b00f3
11 changed files with 109 additions and 89 deletions
--- a/daemon-user/src/ctrl_anime.rs
+++ b/daemon-user/src/ctrl_anime.rs
@@ -91,12 +91,16 @@ impl<'a> CtrlAnimeInner<'static> {
        for action in self.sequences.iter() {
            match action {
                ActionData::Animation(frames) => {
-                    rog_anime::run_animation(frames, self.do_early_return.clone(), &|output| {
+                    rog_anime::run_animation(frames, &|output| {
+                        if self.do_early_return.load(Ordering::Acquire) {
+                            return Ok(true); // Do safe exit
+                        }
                        self.client
                            .proxies()
                            .anime()
                            .write(output)
                            .map_err(|e| AnimeError::Dbus(format!("{}", e)))
+                            .map(|_| false)
                    })?;
                }
                ActionData::Image(image) => {