reset lyrics after song finished

feois · Jun 23, 2024 · f1997d1 · f1997d1
1 parent fe25457
commit f1997d1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/lyrics.rs b/src/lyrics.rs
@@ -181,11 +181,13 @@ mod xosd {
 
         #[inline(always)]
         fn reset(&mut self) -> std::result::Result<(), Self::Error> {
-            show(&mut self.prev, None)?;
-            show(&mut self.curr, None)?;
-            show(&mut self.next, None)?;
-
-            self.showing = false;
+            if self.showing {
+                show(&mut self.prev, None)?;
+                show(&mut self.curr, None)?;
+                show(&mut self.next, None)?;
+
+                self.showing = false;
+            }
 
             Ok(())
         }

diff --git a/src/main.rs b/src/main.rs
@@ -244,6 +244,12 @@ impl App {
                     }
                 }
                 PlayerState::Finished => {
+                    if let Some(lyrics) = &mut app.lyrics {
+                        if let Err(e) = lyrics.reset() {
+                            println!("RUST-ERROR: Failed to reset lyrics {}", e)
+                        }
+                    }
+
                     app.player.idle();
 
                     if app.stop_next {