Fix issue where end-of-track is incorrectly signalled when paused

Author: udoprog

CHANGELOG.md

@@ -8,6 +8,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [Unreleased]: https://github.com/udoprog/OxidizeBot/compare/1.0.4...master
 
+### Fixed
+* Fix issue where end-of-track is incorrectly signalled when paused [#100]
+
+[#100]: https://github.com/udoprog/OxidizeBot/issues/100
+
 ## [1.0.4]
 
 ### Fixed

bot/src/player/playback_future.rs

@@ -1,4 +1,4 @@
-use crate::player::{ConnectStream, PlaybackMode, PlayerInternal, Song};
+use crate::player::{ConnectStream, PlaybackMode, PlayerInternal, Song, State};
 use crate::prelude::*;
 use crate::settings;
 use crate::spotify_id::SpotifyId;
@@ -52,7 +52,10 @@ impl PlaybackFuture {
         loop {
             futures::select! {
                 song = song_stream.select_next_some() => {
-                    song_timeout = song.map(|s| tokio::time::delay_until(s.deadline().into()));
+                    song_timeout = song.and_then(|s| match s.state() {
+                        State::Playing => Some(tokio::time::delay_until(s.deadline().into())),
+                        _ => None,
+                    });
                 }
                 fallback = fallback_stream.select_next_some() => {
                     self.internal.write().await.update_fallback_items(fallback).await;