update pinned gio and foreground usage

katzenpost · Oct 9, 2022 · 0636481 · 0636481
1 parent e50b949
commit 0636481
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/go.mod b/go.mod
@@ -2,7 +2,7 @@ module github.com/katzenpost/katzen
 
 go 1.17
 
-replace gioui.org => github.com/mixmasala/gio v0.0.0-20220820160532-969090a0e510
+replace gioui.org => github.com/mixmasala/gio v0.0.0-20221008115529-61f8a00ed160
 
 replace gioui.org/cmd => github.com/mixmasala/gio-cmd v0.0.0-20220915145538-a9fefc1d3328
 

diff --git a/go.sum b/go.sum
@@ -259,8 +259,8 @@ github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS4
 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mixmasala/gio v0.0.0-20220820160532-969090a0e510 h1:KahtXi+Ce9UEb+rEF3hpFYIaEVoDh/12P1cpkLZkWMs=
-github.com/mixmasala/gio v0.0.0-20220820160532-969090a0e510/go.mod h1:WHoHbUjH91BJS2xkfps2AhKxji+9o3xwfsphGsCBfnM=
+github.com/mixmasala/gio v0.0.0-20221008115529-61f8a00ed160 h1:ZtD4RcEv+BCwq2I5doOKbh09q1J+KHDxLwBTEtiaw2Y=
+github.com/mixmasala/gio v0.0.0-20221008115529-61f8a00ed160/go.mod h1:WHoHbUjH91BJS2xkfps2AhKxji+9o3xwfsphGsCBfnM=
 github.com/mixmasala/gio-cmd v0.0.0-20220915145538-a9fefc1d3328 h1:6WtN+2fI6QGiyWsNwX3qxTKgy8m+y1EazZGZ0F6rAYk=
 github.com/mixmasala/gio-cmd v0.0.0-20220915145538-a9fefc1d3328/go.mod h1:sOPHaz5lc8CQuJqPyX/YTFdcs5+XKNXXa03qxFIln6w=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=

diff --git a/katzen.go b/katzen.go
@@ -56,7 +56,7 @@ var (
 )
 
 type App struct {
-	fg    chan struct{}
+	endBg func()
 	w     *app.Window
 	ops   *op.Ops
 	c     *catshadow.Client
@@ -374,9 +374,15 @@ func (a *App) handleGioEvents(e interface{}) error {
 			}
 		}
 		if e.Stage == system.StagePaused {
-			foreground.Start("Is running in the background", "")
+			var err error
+			a.endBg, err = foreground.Start("Is running in the background", "")
+			if err != nil {
+				return err
+			}
 		} else {
-			foreground.Stop()
+			if a.endBg != nil {
+				a.endBg()
+			}
 		}
 	}
 	return nil