From 953a14016fdbc143e907eab2df6c33bb0aeba5b3 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Tue, 11 Aug 2020 16:08:11 +1000 Subject: [PATCH] Fix phantom NRE from ProcessInput during some crashes on Mono Pretty sure this only affected Mono. The infinite loop in ProgramRunLoop continued even after the form was disposed (in the testing I did, this was always during the call to CheckMessages). However, DisplayManager (actually GlobalWin.DisplayManager) was cleared during disposal, so the call to DisplayManager.UntransformPoint rightly threw an NRE. After this change, the "real" stacktrace is still printed as always. --- src/BizHawk.Client.EmuHawk/MainForm.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs index 5699c791e4..187d94b1a2 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.cs @@ -712,7 +712,7 @@ namespace BizHawk.Client.EmuHawk Close(); } - if (_windowClosedAndSafeToExitProcess) + if (IsDisposed || _windowClosedAndSafeToExitProcess) { break; }