diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fd5bd5..397795c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ One section per version, newest first. +## v0.10.2 (2026-11-06) + +### Bug fixes + +- Leaving the last logged-in server while music plays, by logging out, forgetting it or a turned-down saved login, lets the screensaver run again on the login screen. Logging in after that starts with no leftover pause, position or restore state from the old queue. + ## v0.10.1 (2026-11-06) ### Features diff --git a/Cargo.lock b/Cargo.lock index e98dbd1..9f8bdcc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4385,7 +4385,7 @@ checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" [[package]] name = "remus" -version = "0.10.1" +version = "0.10.2" dependencies = [ "anyhow", "directories", diff --git a/Cargo.toml b/Cargo.toml index bf938a9..8579329 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "remus" -version = "0.10.1" +version = "0.10.2" edition = "2024" license = "MIT" diff --git a/flatpak/me.anshorei.Fettleshed.Remus.metainfo.xml b/flatpak/me.anshorei.Fettleshed.Remus.metainfo.xml index 2614280..d277396 100644 --- a/flatpak/me.anshorei.Fettleshed.Remus.metainfo.xml +++ b/flatpak/me.anshorei.Fettleshed.Remus.metainfo.xml @@ -20,6 +20,7 @@ + diff --git a/src/app.rs b/src/app.rs index 3eca975..c68834f 100644 --- a/src/app.rs +++ b/src/app.rs @@ -704,19 +704,7 @@ impl App { fn switch_server(&mut self, client: Client) { if self.client.is_some() { self.save_queue(); - self.stop_player(); - self.clear_queue(); - self.queue_sel = 0; - self.position = 0.0; - self.duration = 0.0; - self.paused = false; - self.held = false; - self.scrobbled = false; - self.now_playing_due = false; - self.restoring = None; - self.art_shown = None; - self.flip_timer.stop(); - self.ui.set_np_flip_out(false); + self.reset_playback(); } log::info!("browsing {} on {}", client.user(), client.base()); self.enter_browse(client); @@ -725,6 +713,30 @@ impl App { self.sync_inhibit(); } + /// Stops the player and empties the queue with everything kept about it, + /// so the next server starts clean. The player's own events would + /// otherwise update the screen and the screensaver inhibit, but + /// stop_player drops them, so both are done here. + fn reset_playback(&mut self) { + self.stop_player(); + self.clear_queue(); + self.queue_sel = 0; + self.position = 0.0; + self.duration = 0.0; + self.paused = false; + self.held = false; + self.scrobbled = false; + self.now_playing_due = false; + self.restoring = None; + self.art_shown = None; + self.art_waiting = false; + self.flip_timer.stop(); + self.ui.set_np_flip_out(false); + self.render_player(); + self.sync_queue(true); + self.sync_inhibit(); + } + fn clear_queue(&mut self) { self.queue.clear(); self.order.clear(); @@ -910,11 +922,9 @@ impl App { if keep_queue { self.save_queue(); } - self.stop_player(); - self.clear_queue(); + self.reset_playback(); self.client = None; self.checking_login = false; - self.render_player(); } /// The server turned down the saved login of the browsed server: log it