From 8c3ba3a2d6a3db9d277c9d6b7532d125b39e1676 Mon Sep 17 00:00:00 2001 From: Ruben Pollan Date: Mon, 4 Jun 2018 20:39:35 +0200 Subject: [feat] notify if it can't start the VPN - Resolves: #35 --- main.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'main.go') diff --git a/main.go b/main.go index 503d4ff..ddea432 100644 --- a/main.go +++ b/main.go @@ -75,7 +75,11 @@ func checkAndStartBitmask(b *bitmask.Bitmask, notify *notificator, conf *systray log.Printf("Is bitmask running? %v", err) os.Exit(1) } - maybeStartVPN(b, conf) + err = maybeStartVPN(b, conf) + if err != nil { + log.Println("Error starting VPN: ", err) + notify.errorStartingVPN(err) + } } func checkAndInstallHelpers(b *bitmask.Bitmask, notify *notificator) error { @@ -97,16 +101,14 @@ func checkAndInstallHelpers(b *bitmask.Bitmask, notify *notificator) error { return nil } -func maybeStartVPN(b *bitmask.Bitmask, conf *systrayConfig) { +func maybeStartVPN(b *bitmask.Bitmask, conf *systrayConfig) error { if conf.UserStoppedVPN { - return + return nil } err := b.StartVPN(provider) - if err != nil { - log.Println("Error starting VPN: ", err) - } conf.setUserStoppedVPN(false) + return err } func initPrinter() { -- cgit v1.2.3