From 018e3ce34ee573eefd8fdc6b9c536a0106bef724 Mon Sep 17 00:00:00 2001 From: Harvey Tindall Date: Fri, 11 Sep 2020 21:24:11 +0100 Subject: fix crash when tracklength not available --- main.go | 9 +++++++-- waybar-mpris | Bin 973736 -> 973504 bytes 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index a4cb153..b5dbc1b 100644 --- a/main.go +++ b/main.go @@ -157,7 +157,13 @@ func µsToString(µs int64) string { func (p *Player) Position() string { // position is in microseconds so we prob need int64 to be safe - l := p.metadata["mpris:length"].Value().(int64) + v := p.metadata["mpris:length"].Value() + var l int64 + if v != nil { + l = v.(int64) + } else { + return "" + } length := µsToString(l) if length == "" { return "" @@ -436,7 +442,6 @@ func main() { os.Remove(SOCK) os.Exit(1) }() - defer os.Remove(SOCK) if err != nil { log.Fatalln("Couldn't establish socket connection at", SOCK) } diff --git a/waybar-mpris b/waybar-mpris index 05bdd65..30f751b 100755 Binary files a/waybar-mpris and b/waybar-mpris differ -- cgit v1.2.3