Skip to content

Hot fix for v0.13.0 #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aome510 merged 2 commits into from
Mar 29, 2023
Merged

Hot fix for v0.13.0 #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8b2d7e
fix deadlock when using search popup
aome510 Mar 29, 2023
eb5d64f
also update the buffered playback on a new track
aome510 Mar 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions spotify_player/src/client/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1088,15 +1088,25 @@ impl Client {
.map(|t| t.name.to_owned())
.unwrap_or_default();

let needs_update = match (&player.buffered_playback, &playback) {
(Some(bp), Some(p)) => bp.device_id != p.device.id,
player.playback = playback;
player.playback_last_updated_time = Some(std::time::Instant::now());

let curr_track_name = player
.current_playing_track()
.map(|t| t.name.to_owned())
.unwrap_or_default();

let new_track = prev_track_name != curr_track_name && !curr_track_name.is_empty();
// check if we need to update the buffered playback
let needs_update = match (&player.buffered_playback, &player.playback) {
(Some(bp), Some(p)) => bp.device_id != p.device.id || new_track,
(None, None) => false,
_ => true,
};

if needs_update {
// new playback updates, the buffered playback becomes invalid and needs to be updated
player.buffered_playback = playback.as_ref().map(|p| SimplifiedPlayback {
player.buffered_playback = player.playback.as_ref().map(|p| SimplifiedPlayback {
device_name: p.device.name.clone(),
device_id: p.device.id.clone(),
is_playing: p.is_playing,
Expand All @@ -1106,15 +1116,7 @@ impl Client {
});
}

player.playback = playback;
player.playback_last_updated_time = Some(std::time::Instant::now());

let curr_track_name = player
.current_playing_track()
.map(|t| t.name.to_owned())
.unwrap_or_default();

prev_track_name != curr_track_name && !curr_track_name.is_empty()
new_track
};

if !new_track {
Expand Down
3 changes: 3 additions & 0 deletions spotify_player/src/event/popup.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ pub fn handle_key_sequence_for_popup(
// handle popups that need reading the raw key sequence instead of the matched command
match popup {
PopupState::Search { .. } => {
// NOTE: the `drop(ui)` is important as the handle function for search
// re-acquire the UI lock, so we need to drop the current UI lock to avoid a deadlock.
drop(ui);
return handle_key_sequence_for_search_popup(key_sequence, client_pub, state);
}
PopupState::ActionList(item, ..) => {
Expand Down