fix(console): Save SRAM even if autosave fails during close

gabe565 · Jun 18, 2024 · 95d7da7 · 95d7da7
1 parent b2a91fc
commit 95d7da7
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/internal/console/console.go b/internal/console/console.go
@@ -127,18 +127,15 @@ func New(conf *config.Config, cart *cartridge.Cartridge) (*Console, error) {
 }
 
 func (c *Console) Close() error {
+	var errs []error
 	if c.autosave != nil {
 		c.autosave.Stop()
 	}
 	if c.config.State.Resume {
-		if err := c.SaveStateNum(AutoSaveNum, false); err != nil {
-			return err
-		}
-	}
-	if err := c.SaveSRAM(); err != nil {
-		return err
+		errs = append(errs, c.SaveStateNum(AutoSaveNum, false))
 	}
-	return nil
+	errs = append(errs, c.SaveSRAM())
+	return errors.Join(errs...)
 }
 
 func (c *Console) Step(render bool) {