Skip to content

Commit edb98d5

Browse files
committed
Prevent shuffle crash
fixes #959
1 parent f4be9bb commit edb98d5

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

connect/src/spirc.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -668,15 +668,15 @@ impl SpircTask {
668668
self.state.set_shuffle(frame.get_state().get_shuffle());
669669
if self.state.get_shuffle() {
670670
let current_index = self.state.get_playing_track_index();
671-
{
672-
let tracks = self.state.mut_track();
671+
let tracks = self.state.mut_track();
672+
if !tracks.is_empty() {
673673
tracks.swap(0, current_index as usize);
674674
if let Some((_, rest)) = tracks.split_first_mut() {
675675
let mut rng = rand::thread_rng();
676676
rest.shuffle(&mut rng);
677677
}
678+
self.state.set_playing_track_index(0);
678679
}
679-
self.state.set_playing_track_index(0);
680680
} else {
681681
let context = self.state.get_context_uri();
682682
debug!("{:?}", context);

0 commit comments

Comments
 (0)