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

terminate worker thread as soon as possible to avoid race conditions

Browse Source
This commit is contained in:
Henrik Friedrichsen
2020-06-14 19:57:33 +02:00
parent 4d3c071328
commit d7c170fec8
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/spotify.rs
View File

@@ -143,6 +143,12 @@ impl futures::Future for Worker {
loop { loop {
let mut progress = false; let mut progress = false;
if self.session.is_invalid() {
self.player.stop();
self.events.send(Event::Player(PlayerEvent::Stopped));
return Poll::Ready(Result::Err(()));
}
if let Poll::Ready(Some(cmd)) = self.commands.as_mut().poll_next(cx) { if let Poll::Ready(Some(cmd)) = self.commands.as_mut().poll_next(cx) {
progress = true; progress = true;
debug!("message received!"); debug!("message received!");
@@ -216,11 +222,6 @@ impl futures::Future for Worker {
_ => (), _ => (),
} }
if self.session.is_invalid() {
self.events.send(Event::Player(PlayerEvent::Stopped));
return Poll::Ready(Result::Err(()));
}
if !progress { if !progress {
return Poll::Pending; return Poll::Pending;
} }