cmd/vinegar: handle ctrl-c to kill roblox

cmd/vinegar/binary.go

@@ -8,7 +8,8 @@ import (
 	"path/filepath"
 	"strings"
 	"time"
-	_ "syscall"
+	"os/signal"
+	"syscall"
 
 	"github.com/nxadm/tail"
 	bsrpc "github.com/vinegarhq/vinegar/bloxstraprpc"
@@ -85,6 +86,20 @@ func (b *Binary) Run(args ...string) error {
 		return err
 	}
 
+	// act as the signal holder, as roblox/wine will not do anything
+	// with the INT signal.
+	c := make(chan os.Signal, 1)
+	signal.Notify(c, syscall.SIGTERM, syscall.SIGINT)
+
+	go func() {
+		<-c
+		// This way, cmd.Wait() will return and the wineprefix killer
+		// will be ran.
+		log.Println("Killing Roblox")
+		cmd.Process.Kill()
+		signal.Stop(c)
+	}()
+
 	if b.Config.DiscordRPC {
 		err := bsrpc.Login()
 		if err != nil {

cmd/vinegar/vinegar.go

@@ -107,7 +107,7 @@ func main() {
 			b.Splash.Desc(b.Config.Channel)
 
 			errHandler := func(err error) {
-				if !cfg.Splash.Enabled {
+				if !cfg.Splash.Enabled || b.Splash.IsClosed() {
 					log.Fatal(err)
 				}
 

internal/splash/splash.go

@@ -68,6 +68,10 @@ func (ui *Splash) Close() {
 	ui.Perform(system.ActionClose)
 }
 
+func (ui *Splash) IsClosed() bool {
+	return ui.closed
+}
+
 func window(width, height unit.Dp) *app.Window {
 	return app.NewWindow(
 		app.Decorated(false),
@@ -155,6 +159,7 @@ func (ui *Splash) Run() error {
 	var exitButton widget.Clickable
 
 	if !ui.Config.Enabled {
+		ui.closed = true
 		return nil
 	}
 
@@ -243,6 +248,7 @@ func (ui *Splash) Run() error {
 		}
 	}
 
+	ui.closed = true
 	return nil
 }