From 002fb15db42943095e0730a741c0fa5a208ea683 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz+git@gmail.com>
Date: Tue, 24 Jun 2025 08:23:17 +1000
Subject: [PATCH] Enable RCS1236 and fix noncompliance

"Use exception filter" (`catch when`)
---
 .global.editorconfig.ini                        |  2 ++
 src/BizHawk.Client.Common/RomLoader.cs          |  5 ++---
 src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs | 15 ++++++++-------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.global.editorconfig.ini b/.global.editorconfig.ini
index 67fc9ccc1d..34c327ce3f 100644
--- a/.global.editorconfig.ini
+++ b/.global.editorconfig.ini
@@ -462,6 +462,8 @@ dotnet_diagnostic.RCS1195.severity = warning
 dotnet_diagnostic.RCS1224.severity = warning
 # Add paragraph to documentation comment
 dotnet_diagnostic.RCS1226.severity = warning
+# Use exception filter
+dotnet_diagnostic.RCS1236.severity = warning
 # Do not pass non-read-only struct by read-only reference
 dotnet_diagnostic.RCS1242.severity = silent
 
diff --git a/src/BizHawk.Client.Common/RomLoader.cs b/src/BizHawk.Client.Common/RomLoader.cs
index eae2f9c538..2bf8e238a9 100644
--- a/src/BizHawk.Client.Common/RomLoader.cs
+++ b/src/BizHawk.Client.Common/RomLoader.cs
@@ -432,10 +432,9 @@ namespace BizHawk.Client.Common
 				{
 					return core.Create(cip);
 				}
-				catch (Exception e)
+				catch (Exception e) when (!_config.DontTryOtherCores
+					&& e is not (MissingFirmwareException or { InnerException: MissingFirmwareException }))
 				{
-					if (_config.DontTryOtherCores || e is MissingFirmwareException || e.InnerException is MissingFirmwareException)
-						throw;
 					exceptions.Add(e);
 				}
 			}
diff --git a/src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs b/src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
index d1432f63f9..3f469ce93f 100644
--- a/src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
+++ b/src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
@@ -276,14 +276,15 @@ namespace BizHawk.Client.EmuHawk
 			{
 				Directory.CreateDirectory(movieFolderPath);
 			}
-			catch (Exception movieDirException)
+			catch (IOException)
 			{
-				if (movieDirException is IOException
-					|| movieDirException is UnauthorizedAccessException)
-				{
-					//TO DO : Pass error to user?
-				}
-				else throw;
+				// ignored
+				//TODO present to user?
+			}
+			catch (UnauthorizedAccessException)
+			{
+				// ignored
+				//TODO present to user?
 			}
 
 			var filterset = _movieSession.Movie.GetFSFilterSet();