From 547c28ef28321d0b9bfeec461dac6a1779fbfea4 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Thu, 27 Jan 2022 02:46:05 +1000 Subject: [PATCH] Add back extra params to `RomLoader.DoLoadErrorCallback` (fixes #3054) fixes fb6924bd8 --- src/BizHawk.Client.Common/RomLoader.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/BizHawk.Client.Common/RomLoader.cs b/src/BizHawk.Client.Common/RomLoader.cs index e5a1a129e2..032ddfa92d 100644 --- a/src/BizHawk.Client.Common/RomLoader.cs +++ b/src/BizHawk.Client.Common/RomLoader.cs @@ -714,7 +714,7 @@ public bool LoadRom(string path, CoreComm nextComm, string launchLibretroCore, s { var system = game?.System; - DispatchErrorMessage(ex, system); + DispatchErrorMessage(ex, system: system, path: path); return false; } @@ -724,7 +724,7 @@ public bool LoadRom(string path, CoreComm nextComm, string launchLibretroCore, s return true; } - private void DispatchErrorMessage(Exception ex, string system) + private void DispatchErrorMessage(Exception ex, string system, string path) { if (ex is AggregateException agg) { @@ -735,7 +735,7 @@ private void DispatchErrorMessage(Exception ex, string system) } foreach (Exception e in agg.InnerExceptions) { - DispatchErrorMessage(e, system); + DispatchErrorMessage(e, system: system, path: path); } return; @@ -748,7 +748,7 @@ private void DispatchErrorMessage(Exception ex, string system) if (ex is MissingFirmwareException) { - DoLoadErrorCallback(ex.Message, system, LoadErrorType.MissingFirmware); + DoLoadErrorCallback(ex.Message, system, path, Deterministic, LoadErrorType.MissingFirmware); } else if (ex is CGBNotSupportedException) {