Merge pull request getlantern#36 from EssGeeEich/master

Forcefully delete the taskbar icon during quit on Windows

Author: andydotxyz

systray.go

@@ -10,15 +10,25 @@ import (
 )
 
 var (
-	systrayReady  func()
-	systrayExit   func()
-	menuItems     = make(map[uint32]*MenuItem)
-	menuItemsLock sync.RWMutex
+	systrayReady      func()
+	systrayExit       func()
+	systrayExitCalled bool
+	menuItems         = make(map[uint32]*MenuItem)
+	menuItemsLock     sync.RWMutex
 
 	currentID = uint32(0)
 	quitOnce  sync.Once
 )
 
+// This helper function allows us to call systrayExit only once,
+// without accidentally calling it twice in the same lifetime.
+func runSystrayExit() {
+	if !systrayExitCalled {
+		systrayExitCalled = true
+		systrayExit()
+	}
+}
+
 func init() {
 	runtime.LockOSThread()
 }
@@ -111,6 +121,7 @@ func Register(onReady func(), onExit func()) {
 		onExit = func() {}
 	}
 	systrayExit = onExit
+	systrayExitCalled = false
 	registerSystray()
 }
 

systray_darwin.go

@@ -144,7 +144,7 @@ func systray_ready() {
 
 //export systray_on_exit
 func systray_on_exit() {
-	systrayExit()
+	runSystrayExit()
 }
 
 //export systray_menu_item_selected

systray_unix.go

@@ -154,7 +154,7 @@ func nativeLoop() int {
 }
 
 func nativeEnd() {
-	systrayExit()
+	runSystrayExit()
 	instance.conn.Close()
 }
 

systray_windows.go

@@ -324,7 +324,7 @@ func (t *winTray) wndProc(hWnd windows.Handle, message uint32, wParam, lParam ui
 			t.nid.delete()
 		}
 		t.muNID.Unlock()
-		systrayExit()
+		runSystrayExit()
 	case t.wmSystrayMessage:
 		switch lParam {
 		case WM_RBUTTONUP, WM_LBUTTONUP:
@@ -951,6 +951,13 @@ func quit() {
 		0,
 		0,
 	)
+
+	wt.muNID.Lock()
+	if wt.nid != nil {
+		wt.nid.delete()
+	}
+	wt.muNID.Unlock()
+	runSystrayExit()
 }
 
 func setInternalLoop(bool) {

systray_windows_test.go

@@ -18,6 +18,7 @@ const iconFilePath = "example/icon/iconwin.ico"
 func TestBaseWindowsTray(t *testing.T) {
 	systrayReady = func() {}
 	systrayExit = func() {}
+	systrayExitCalled = false
 
 	runtime.LockOSThread()