Skip to content

fix: media keys skipping two tracks on Windows #148

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
noFAYZ merged 1 commit into from
Sep 27, 2026
Merged

fix: media keys skipping two tracks on Windows #148

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 1 addition & 24 deletions src-tauri/src/windows_media.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ use windows::{
},
Media::{
MediaPlaybackStatus, MediaPlaybackType, SystemMediaTransportControls,
SystemMediaTransportControlsButton, SystemMediaTransportControlsButtonPressedEventArgs,
SystemMediaTransportControlsTimelineProperties,
},
Storage::Streams::RandomAccessStreamReference,
Expand Down Expand Up @@ -71,7 +70,6 @@ struct NativeMediaSession {
_pause_token: i64,
_next_token: i64,
_previous_token: i64,
_button_pressed_token: i64,
}

impl WindowsMediaSession {
Expand Down Expand Up @@ -188,27 +186,7 @@ impl NativeMediaSession {
}))
.map_err(|error| error.to_string())?;

let button_pressed_app = app.clone();
let button_pressed_token = controls
.ButtonPressed(&TypedEventHandler::<
SystemMediaTransportControls,
SystemMediaTransportControlsButtonPressedEventArgs,
>::new(move |_sender, args| {
let Some(args) = args.as_ref() else {
return Ok(());
};
let action = match args.Button()? {
SystemMediaTransportControlsButton::Next => Some("next"),
SystemMediaTransportControlsButton::Previous => Some("previous"),
_ => None,
};
if let Some(action) = action {
let _ = button_pressed_app.emit(MEDIA_CONTROL_EVENT, action);
}
Ok(())
}))
.map_err(|error| error.to_string())?;

// No ButtonPressed handler: Next/PreviousReceived already fire for it; both skipped twice (#136).
let taskbar_toolbar = ThumbnailToolbar::new(&app).ok();

Ok(Self {
Expand All @@ -221,7 +199,6 @@ impl NativeMediaSession {
_pause_token: pause_token,
_next_token: next_token,
_previous_token: previous_token,
_button_pressed_token: button_pressed_token,
})
}

Expand Down
Loading