From fcc7514ec5f1b35068b1033d8ac4278c45043a80 Mon Sep 17 00:00:00 2001 From: Ruben Pollan Date: Fri, 8 Jun 2018 10:26:58 +0200 Subject: [feat] pure go bitmask vpn implemenation - Resolves: #42 --- systray.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'systray.go') diff --git a/systray.go b/systray.go index dd8a77c..aea8d04 100644 --- a/systray.go +++ b/systray.go @@ -27,7 +27,7 @@ import ( ) type bmTray struct { - bm *bitmask.Bitmask + bm bitmask.Bitmask conf *systrayConfig notify *notificator waitCh chan bool @@ -44,7 +44,7 @@ type gatewayTray struct { name string } -func run(bm *bitmask.Bitmask, conf *systrayConfig, notify *notificator) { +func run(bm bitmask.Bitmask, conf *systrayConfig, notify *notificator) { bt := bmTray{bm: bm, conf: conf, notify: notify} systray.Run(bt.onReady, bt.onExit) } @@ -117,13 +117,13 @@ func (bt *bmTray) onReady() { open.Run("https://riseup.net/vpn/donate") case <-mAbout.ClickedCh: bitmaskVersion, err := bt.bm.Version() + versionStr := version if err != nil { log.Printf("Error getting version: %v", err) - bt.notify.about(version) - } else { - versionStr := fmt.Sprintf("%s (bitmaskd %s)", version, bitmaskVersion) - bt.notify.about(versionStr) + } else if bitmaskVersion != "" { + versionStr = fmt.Sprintf("%s (bitmaskd %s)", version, bitmaskVersion) } + bt.notify.about(versionStr) case <-mQuit.ClickedCh: systray.Quit() -- cgit v1.2.3