lostecho/ncspot
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

report stopped playback when player task or session has died

Browse Source
This commit is contained in:
Henrik Friedrichsen
2020-06-13 20:36:05 +02:00
parent 8013609d0e
commit 4d3c071328
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/spotify.rs
View File

@@ -143,10 +143,6 @@ impl futures::Future for Worker {
loop {
let mut progress = false;
if self.session.is_invalid() {
return Poll::Ready(Result::Err(()));
}
if let Poll::Ready(Some(cmd)) = self.commands.as_mut().poll_next(cx) {
progress = true;
debug!("message received!");
@@ -195,7 +191,8 @@ impl futures::Future for Worker {
self.events.send(Event::Player(PlayerEvent::FinishedTrack));
}
Poll::Ready(Err(Canceled)) => {
debug!("player task is over!");
error!("player task was cancelled!");
self.events.send(Event::Player(PlayerEvent::Stopped));
self.play_task = Box::pin(futures::future::pending());
}
Poll::Pending => (),
@@ -219,6 +216,11 @@ impl futures::Future for Worker {
_ => (),
}
if self.session.is_invalid() {
self.events.send(Event::Player(PlayerEvent::Stopped));
return Poll::Ready(Result::Err(()));
}
if !progress {
return Poll::Pending;
}