dont try to log the shutdown while shutting down, which causes a dead…

…lock

ui/gui/gui.go

@@ -3,6 +3,7 @@ package gui
 import (
 	"context"
 	"errors"
+	"fmt"
 	"image/color"
 
 	"gioui.org/app"
@@ -112,6 +113,7 @@ func (g *GUI) loop(window *app.Window) error {
 
 	for {
 		e := window.Event()
+		fmt.Printf("window.Event %+#v\n", e)
 
 		if g.ctx.Err() != nil && !closing {
 			logrus.Info("Closing")
@@ -121,6 +123,7 @@ func (g *GUI) loop(window *app.Window) error {
 		}
 		switch e := e.(type) {
 		case app.DestroyEvent:
+			g.router.ShuttingDown = true
 			logrus.Info("Closing")
 			g.cancel(errors.New("Closing"))
 			g.router.Wg.Wait()

ui/gui/logger.go

@@ -55,6 +55,8 @@ func (l *logger) Fire(e *logrus.Entry) error {
 	l.l.Lock()
 	l.lines = append(l.lines, e)
 	l.l.Unlock()
-	l.router.Invalidate()
+	if !l.router.ShuttingDown {
+		l.router.Invalidate()
+	}
 	return nil
 }

ui/gui/pages/router.go

@@ -54,6 +54,8 @@ type Router struct {
 	showLogs  bool
 
 	popups []popups.Popup
+
+	ShuttingDown bool
 }
 
 func NewRouter(uii ui.UI) *Router {