Player: Remove an unwrap
This commit is contained in:
parent
654c0e5e56
commit
986d898217
@ -320,13 +320,20 @@ impl PlayerWidget {
|
|||||||
fn connect_mpris_buttons(s: &Rc<Self>) {
|
fn connect_mpris_buttons(s: &Rc<Self>) {
|
||||||
let weak = Rc::downgrade(s);
|
let weak = Rc::downgrade(s);
|
||||||
|
|
||||||
let mpris = s.mpris.clone();
|
let mpris = s.info.mpris.clone();
|
||||||
s.mpris.connect_play_pause(clone!(weak => move || {
|
s.info.mpris.connect_play_pause(clone!(weak => move || {
|
||||||
match mpris.get_playback_status().unwrap().as_ref() {
|
let player = match weak.upgrade() {
|
||||||
"Paused" => weak.upgrade().map(|p| p.play()),
|
Some(s) => s,
|
||||||
"Stopped" => weak.upgrade().map(|p| p.play()),
|
None => return
|
||||||
_ => weak.upgrade().map(|p| p.pause()),
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
if let Ok(status) = mpris.get_playback_status() {
|
||||||
|
match status.as_ref() {
|
||||||
|
"Paused" => player.play(),
|
||||||
|
"Stopped" => player.play(),
|
||||||
|
_ => player.pause(),
|
||||||
|
};
|
||||||
|
}
|
||||||
}));
|
}));
|
||||||
|
|
||||||
s.mpris.connect_next(clone!(weak => move || {
|
s.mpris.connect_next(clone!(weak => move || {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user