Add back extra params to RomLoader.DoLoadErrorCallback (fixes #3054)

YoshiRulz · YoshiRulz · commit 547c28ef2832 · 2022-01-27T02:48:54.000+10:00
fixes fb6924b
diff --git 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)
 			{

Original file line number	Diff line number	Diff line change
`@@ -714,7 +714,7 @@ public bool LoadRom(string path, CoreComm nextComm, string launchLibretroCore, s`
`714`	`714`	`{`
`715`	`715`	`var system = game?.System;`
`716`	`716`
`717`		`- DispatchErrorMessage(ex, system);`
	`717`	`+ DispatchErrorMessage(ex, system: system, path: path);`
`718`	`718`	`return false;`
`719`	`719`	`}`
`720`	`720`
`@@ -724,7 +724,7 @@ public bool LoadRom(string path, CoreComm nextComm, string launchLibretroCore, s`
`724`	`724`	`return true;`
`725`	`725`	`}`
`726`	`726`
`727`		`- private void DispatchErrorMessage(Exception ex, string system)`
	`727`	`+ private void DispatchErrorMessage(Exception ex, string system, string path)`
`728`	`728`	`{`
`729`	`729`	`if (ex is AggregateException agg)`
`730`	`730`	`{`
`@@ -735,7 +735,7 @@ private void DispatchErrorMessage(Exception ex, string system)`
`735`	`735`	`}`
`736`	`736`	`foreach (Exception e in agg.InnerExceptions)`
`737`	`737`	`{`
`738`		`- DispatchErrorMessage(e, system);`
	`738`	`+ DispatchErrorMessage(e, system: system, path: path);`
`739`	`739`	`}`
`740`	`740`
`741`	`741`	`return;`
`@@ -748,7 +748,7 @@ private void DispatchErrorMessage(Exception ex, string system)`
`748`	`748`
`749`	`749`	`if (ex is MissingFirmwareException)`
`750`	`750`	`{`
`751`		`- DoLoadErrorCallback(ex.Message, system, LoadErrorType.MissingFirmware);`
	`751`	`+ DoLoadErrorCallback(ex.Message, system, path, Deterministic, LoadErrorType.MissingFirmware);`
`752`	`752`	`}`
`753`	`753`	`else if (ex is CGBNotSupportedException)`
`754`	`754`	`{`