Reorder shutdown functions

pkg/worker/caged/libretro/frontend.go

@@ -217,13 +217,12 @@ func (f *Frontend) SetOnAV(fn func()) { f.nano.OnSystemAvInfo = fn }
 func (f *Frontend) Start() {
 	f.log.Debug().Msgf("frontend start")
 
-	f.done = make(chan struct{})
-	f.nano.LastFrameTime = time.Now().UnixNano()
-
 	f.mui.Lock()
-	defer f.Shutdown()
 	defer f.mui.Unlock()
 
+	f.done = make(chan struct{})
+	f.nano.LastFrameTime = time.Now().UnixNano()
+
 	if f.HasSave() {
 		// advance 1 frame for Mupen save state
 		if f.nano.LibCo {
@@ -306,17 +305,19 @@ func (f *Frontend) ViewportCalc() (nw int, nh int) {
 
 func (f *Frontend) Close() {
 	f.log.Debug().Msgf("frontend close")
+
 	close(f.done)
 
 	f.mui.Lock()
 	defer f.mui.Unlock()
 	// Save game on quit if it was saved before (shared or click-saved).
 	if f.SaveOnClose && f.HasSave() {
-		f.log.Debug().Msg("Save on quit")
+		f.log.Debug().Msg("save on quit")
 		if err := f.Save(); err != nil {
 			f.log.Error().Err(err).Msg("save on quit failed")
 		}
 	}
+	f.Shutdown()
 	f.nano.Close()
 	f.log.Debug().Msgf("frontend closed")
 }

pkg/worker/caged/libretro/frontend_test.go

@@ -137,7 +137,6 @@ func (emu *TestFrontend) Shutdown() {
 	_ = os.Remove(emu.HashPath())
 	_ = os.Remove(emu.SRAMPath())
 	emu.Frontend.Close()
-	emu.Frontend.Shutdown()
 }
 
 // dumpState returns both current and previous emulator save state as MD5 hash string.