From a0ebb2f551874fa939037b986b19d0a8e69cd3a8 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Tue, 19 Jan 2021 01:14:49 +1000 Subject: [PATCH] Ensure surfaces are unlocked when disposing of GuiApi actually properly fixes #2571 for real this time --- src/BizHawk.Client.Common/Api/Classes/GuiApi.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/BizHawk.Client.Common/Api/Classes/GuiApi.cs b/src/BizHawk.Client.Common/Api/Classes/GuiApi.cs index b6cf385f49..ae18448e57 100644 --- a/src/BizHawk.Client.Common/Api/Classes/GuiApi.cs +++ b/src/BizHawk.Client.Common/Api/Classes/GuiApi.cs @@ -597,6 +597,8 @@ namespace BizHawk.Client.Common public void Dispose() { + UnlockSurface(DisplaySurfaceID.EmuCore); + UnlockSurface(DisplaySurfaceID.Client); foreach (var brush in _solidBrushes.Values) brush.Dispose(); foreach (var brush in _pens.Values) brush.Dispose(); }