clusterfuck
/
crabidy
4
1
Fork 0
Code Issues 15 Pull Requests Actions Packages Projects 1 Releases 5 Wiki Activity

Fix toggle shuffle bug

This commit is contained in:
Hans Mündelein 2023-06-10 11:04:13 +02:00
parent 773cb511e0
commit ef22a84021
Signed by: hans
GPG Key ID: BA7B55E984CE74F4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crabidy-server/src/playback.rs
View File

@ -249,13 +249,13 @@ impl Playback {
{ {
let mut queue = self.queue.lock().unwrap(); let mut queue = self.queue.lock().unwrap();
debug!("got queue lock"); debug!("got queue lock");
shuffle = queue.shuffle;
repeat = queue.repeat; repeat = queue.repeat;
if queue.shuffle { if queue.shuffle {
queue.shuffle_on()
} else {
queue.shuffle_off() queue.shuffle_off()
} else {
queue.shuffle_on()
} }
shuffle = queue.shuffle;
} }
debug!("queue lock released"); debug!("queue lock released");
let queue_update_tx = self.update_tx.clone(); let queue_update_tx = self.update_tx.clone();
@ -274,12 +274,12 @@ impl Playback {
let mut queue = self.queue.lock().unwrap(); let mut queue = self.queue.lock().unwrap();
debug!("got queue lock"); debug!("got queue lock");
shuffle = queue.shuffle; shuffle = queue.shuffle;
repeat = queue.repeat;
if queue.repeat { if queue.repeat {
queue.repeat = false queue.repeat = false
} else { } else {
queue.repeat = true queue.repeat = true
} }
repeat = queue.repeat;
} }
debug!("queue lock released"); debug!("queue lock released");
let queue_update_tx = self.update_tx.clone(); let queue_update_tx = self.update_tx.clone();

2
crabidy-server/src/rpc.rs
View File

@ -242,7 +242,7 @@ impl CrabidyService for RpcService {
&self, &self,
_request: tonic::Request<ToggleRepeatRequest>, _request: tonic::Request<ToggleRepeatRequest>,
) -> std::result::Result<tonic::Response<ToggleRepeatResponse>, tonic::Status> { ) -> std::result::Result<tonic::Response<ToggleRepeatResponse>, tonic::Status> {
debug!("Received toggle_shuffle request"); debug!("Received toggle_repeat request");
let playback_tx = self.playback_tx.clone(); let playback_tx = self.playback_tx.clone();
let span = debug_span!("play-chan"); let span = debug_span!("play-chan");
playback_tx playback_tx