From 1e3491ea2cac285fb393a27de5f6d7407e42981c Mon Sep 17 00:00:00 2001
From: Ruben Pollan <meskio@sindominio.net>
Date: Mon, 19 Mar 2018 11:17:56 +0100
Subject: [PATCH] [feat] remove the hack on exit
The systray quit is being fixed in our fork of the getlantern/systray.
---
systray.go | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/systray.go b/systray.go
index d72562c0..bc53f018 100644
--- a/systray.go
+++ b/systray.go
@@ -17,7 +17,6 @@ package main
import (
"log"
- "os"
"time"
"0xacab.org/leap/bitmask-systray/bitmask"
@@ -50,8 +49,7 @@ func run(bm *bitmask.Bitmask, conf *systrayConfig) {
}
func (bt bmTray) onExit() {
- // TODO: this doesn't get executed :(
- log.Println("Finished onExit")
+ log.Println("Closing systray")
}
func (bt *bmTray) onReady() {
@@ -116,12 +114,6 @@ func (bt *bmTray) onReady() {
case <-mQuit.ClickedCh:
systray.Quit()
- // XXX: this a hack as quit doesn't work
- // this should be done by defer in the main function
- bt.bm.Close()
- releasePID()
- log.Println("Quit now...")
- os.Exit(0)
case <-time.After(time.Minute * 30):
}
--
GitLab