diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs index f7f8434255..b4c68bf03f 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs @@ -256,7 +256,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64 LagCount++; } - Frame++; + if(!api.IsCrashed) + Frame++; } public string SystemId { get { return "N64"; } } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusCoreApi.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusCoreApi.cs index 76815d8547..0463979b79 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusCoreApi.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusCoreApi.cs @@ -572,6 +572,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi volatile bool emulator_running = false; + public bool IsCrashed => !emulator_running; + /// /// Starts executing the emulator asynchronously /// Waits until the emulator booted up and than returns diff --git a/output/dll/mupen64plus.dll b/output/dll/mupen64plus.dll index 6842266a44..0c76346eb4 100644 Binary files a/output/dll/mupen64plus.dll and b/output/dll/mupen64plus.dll differ