refactor: save config if valid, abort on invalid config in startup

Author: sewnie

cmd/vinegar/app.go

@@ -42,7 +42,6 @@ func newApp() *app {
 			// an effective wrapper for Studio arguments.
 			gio.GApplicationHandlesCommandLineValue,
 		),
-		cfg: config.Default(),
 		rbx: rbxweb.NewClient(),
 	}
 
@@ -57,8 +56,6 @@ func newApp() *app {
 }
 
 func (a *app) reload() error {
-	slog.Info("Reloading!")
-
 	pfx, err := a.cfg.Prefix()
 	if err != nil {
 		return fmt.Errorf("prefix configure: %w", err)
@@ -92,19 +89,18 @@ func (a *app) startup(_ gio.Application) {
 	cfg, err := config.Load()
 	if err != nil {
 		a.showError(fmt.Errorf("config error: %w", err))
-	} else {
-		a.cfg = cfg
+		return
 	}
+	a.cfg = cfg
 
 	if err := a.reload(); err != nil {
 		a.showError(err)
 	}
 }
 
 func (a *app) commandLine(_ gio.Application, clPtr uintptr) int {
-	if a.keepLog {
-		// Error dialog is open currently
-		return 0
+	if a.cfg == nil || a.pfx == nil {
+		return 1
 	}
 
 	cl := gio.ApplicationCommandLineNewFromInternalPtr(clPtr)

cmd/vinegar/manager_actions.go

@@ -62,13 +62,12 @@ func (m *manager) saveConfig() {
 	m.builder.GetObject("banner-config-error").Cast(&banner)
 	banner.SetRevealed(false)
 
-	if err := m.cfg.Save(); err != nil {
-		m.showError(err)
-		return
-	}
-
 	err := m.reload()
 	if err == nil {
+		slog.Info("Saving configuration!")
+		if err := m.cfg.Save(); err != nil {
+			m.showError(fmt.Errorf("save config: %w", err))
+		}
 		return
 	}