refactor: rework bootstrapper window visibility

Author: sewnie

cmd/vinegar/bootstrapper.go

@@ -76,6 +76,15 @@ func (b *bootstrapper) message(msg string, args ...any) {
 }
 
 func (b *bootstrapper) run(args ...string) error {
+	gtkutil.IdleAdd(func() {
+		b.app.AddWindow(&b.win.Window)
+		b.win.Present()
+	})
+	defer gtkutil.IdleAdd(func() {
+		b.app.RemoveWindow(&b.win.Window)
+		b.win.SetVisible(false) // Incase bailed out
+	})
+
 	if err := b.setup(); err != nil {
 		return fmt.Errorf("setup: %w", err)
 	}

cmd/vinegar/bootstrapper_setup.go

@@ -22,11 +22,6 @@ func (b *bootstrapper) setup() error {
 		return nil
 	}
 
-	gtkutil.IdleAdd(func() {
-		b.app.AddWindow(&b.win.Window)
-		b.win.Present()
-	})
-
 	pfxFirstRun := !b.pfx.Exists()
 
 	if err := b.setupPrefix(); err != nil {

cmd/vinegar/manager_actions.go

@@ -39,12 +39,12 @@ func (m *manager) run() error {
 	defer show()
 
 	if m.pfx.Exists() && len(m.boot.procs) == 0 {
-		if err := m.app.boot.setup(); err != nil {
-			return fmt.Errorf("setup: %w", err)
+		visible := func() {
+			if !m.boot.win.GetVisible() {
+				show()
+			}
 		}
-
-		// When command is finally executed
-		h := m.app.boot.win.ConnectSignal("notify::visible", &show)
+		h := m.app.boot.win.ConnectSignal("notify::visible", &visible)
 		defer func() { m.app.boot.win.DisconnectSignal(h) }()
 		return m.app.boot.run()
 	}