github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2024-09-19 16:08:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #426 from kaymes/empty-queue-crash

Browse source 
Prevent spirc from crashing when the queue is empty.
This commit is contained in:
Sasha Hilton 2020-01-24 03:05:07 +01:00 committed by GitHub
parent 01be8e7efa 113bb92c9d
commit 6f7fd9f398
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
connect/src/spirc.rs
View file

@ -535,6 +535,8 @@ impl SpircTask {
} else { } else {
info!("No more tracks left in queue"); info!("No more tracks left in queue");
self.state.set_status(PlayStatus::kPlayStatusStop); self.state.set_status(PlayStatus::kPlayStatusStop);
self.player.stop();
self.mixer.stop();
} }
self.notify(None); self.notify(None);
@ -671,12 +673,13 @@ impl SpircTask {
// Removes current track if it is queued // Removes current track if it is queued
// Returns the index of the next track // Returns the index of the next track
let current_index = self.state.get_playing_track_index() as usize; let current_index = self.state.get_playing_track_index() as usize;
if self.state.get_track()[current_index].get_queued() { if (current_index < self.state.get_track().len()) && self.state.get_track()[current_index].get_queued() {
self.state.mut_track().remove(current_index); self.state.mut_track().remove(current_index);
return current_index; current_index
} } else {
current_index + 1 current_index + 1
} }
}
fn handle_next(&mut self) { fn handle_next(&mut self) {
let mut new_index = self.consume_queued_track() as u32; let mut new_index = self.consume_queued_track() as u32;
@ -708,12 +711,23 @@ impl SpircTask {
new_index = 0; // Loop around back to start new_index = 0; // Loop around back to start
continue_playing = self.state.get_repeat(); continue_playing = self.state.get_repeat();
} }
if tracks_len > 0 {
self.state.set_playing_track_index(new_index); self.state.set_playing_track_index(new_index);
self.state.set_position_ms(0); self.state.set_position_ms(0);
let now = self.now_ms(); let now = self.now_ms();
self.state.set_position_measured_at(now as u64); self.state.set_position_measured_at(now as u64);
self.load_track(continue_playing); self.load_track(continue_playing);
} else {
info!("Not playing next track because there are no more tracks left in queue.");
self.state.set_playing_track_index(0);
self.state.set_status(PlayStatus::kPlayStatusStop);
self.player.stop();
self.mixer.stop();
}
} }
fn handle_prev(&mut self) { fn handle_prev(&mut self) {