Merge pull request #242 from arduino/fix_ls

Stefania · web-flow · commit bd3a6afc9cc7 · 2018-07-26T12:31:57.000+02:00
Prevent delays from displaying the trayicon
diff --git a/main.go b/main.go
@@ -6,7 +6,6 @@ package main
 import (
 	"encoding/json"
 	"flag"
-	"fmt"
 	"os"
 	"os/user"
 	"path/filepath"
@@ -98,7 +97,8 @@ func main() {
 		os.Exit(0)
 	}
 
-	fmt.Println(*hibernate)
+	// Launch systray
+	go setupSysTray()
 
 	if *hibernate == false {
 		// autoextract self
@@ -288,7 +288,9 @@ func main() {
 			}
 		}()
 	}
-	setupSysTray()
+
+	// Block forever until the application is shut down
+	select {}
 }
 
 var homeTemplate = template.Must(template.New("home").Parse(homeTemplateHtml))

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ package main`
`6`	`6`	`import (`
`7`	`7`	`"encoding/json"`
`8`	`8`	`"flag"`
`9`		`- "fmt"`
`10`	`9`	`"os"`
`11`	`10`	`"os/user"`
`12`	`11`	`"path/filepath"`
`@@ -98,7 +97,8 @@ func main() {`
`98`	`97`	`os.Exit(0)`
`99`	`98`	`}`
`100`	`99`
`101`		`- fmt.Println(*hibernate)`
	`100`	`+ // Launch systray`
	`101`	`+ go setupSysTray()`
`102`	`102`
`103`	`103`	`if *hibernate == false {`
`104`	`104`	`// autoextract self`
`@@ -288,7 +288,9 @@ func main() {`
`288`	`288`	`}`
`289`	`289`	`}()`
`290`	`290`	`}`
`291`		`- setupSysTray()`
	`291`	`+`
	`292`	`+ // Block forever until the application is shut down`
	`293`	`+ select {}`
`292`	`294`	`}`
`293`	`295`
`294`	`296`	`var homeTemplate = template.Must(template.New("home").Parse(homeTemplateHtml))`