From bee07cca7e9430327330af461c9b3ff16799586e Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz+git@gmail.com>
Date: Fri, 13 Jun 2025 02:35:03 +1000
Subject: [PATCH] Remove some redundant `fi.Directory?.Exists` checks

---
 src/BizHawk.Client.Common/SaveSlotManager.cs  |  6 +-----
 src/BizHawk.Client.Common/tools/CheatList.cs  |  7 +------
 src/BizHawk.Client.EmuHawk/MainForm.cs        | 20 +++----------------
 .../tools/ToolManager.cs                      |  8 +-------
 .../tools/TraceLogger.cs                      |  5 +----
 5 files changed, 7 insertions(+), 39 deletions(-)

diff --git a/src/BizHawk.Client.Common/SaveSlotManager.cs b/src/BizHawk.Client.Common/SaveSlotManager.cs
index 5760e21801..ea95e684f8 100644
--- a/src/BizHawk.Client.Common/SaveSlotManager.cs
+++ b/src/BizHawk.Client.Common/SaveSlotManager.cs
@@ -31,11 +31,7 @@ namespace BizHawk.Client.Common
 				else
 				{
 					var file = new FileInfo($"{saveStatePrefix}.QuickSave{i % 10}.State");
-					if (file.Directory != null && !file.Directory.Exists)
-					{
-						file.Directory.Create();
-					}
-
+					file.Directory?.Create();
 					_slots[i - 1] = file.Exists;
 				}
 			}
diff --git a/src/BizHawk.Client.Common/tools/CheatList.cs b/src/BizHawk.Client.Common/tools/CheatList.cs
index e685764ee6..a9cca688a9 100644
--- a/src/BizHawk.Client.Common/tools/CheatList.cs
+++ b/src/BizHawk.Client.Common/tools/CheatList.cs
@@ -255,12 +255,7 @@ namespace BizHawk.Client.Common
 		{
 			try
 			{
-				var file = new FileInfo(path);
-				if (file.Directory != null && !file.Directory.Exists)
-				{
-					file.Directory.Create();
-				}
-
+				new FileInfo(path).Directory?.Create();
 				var sb = new StringBuilder();
 
 				foreach (var cheat in _cheatList)
diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
index 89eb30349b..9c087905db 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.cs
@@ -1488,11 +1488,7 @@ namespace BizHawk.Client.EmuHawk
 		public void TakeScreenshot(string path)
 		{
 			var fi = new FileInfo(path);
-			if (fi.Directory != null && !fi.Directory.Exists)
-			{
-				fi.Directory.Create();
-			}
-
+			fi.Directory?.Create();
 			using (var bb = Config.ScreenshotCaptureOsd ? CaptureOSD() : MakeScreenshotImage())
 			{
 				using var img = bb.ToSysdrawingBitmap();
@@ -4383,12 +4379,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 
 			var path = $"{SaveStatePrefix()}.{quickSlotName}.State";
-
-			var file = new FileInfo(path);
-			if (file.Directory != null && !file.Directory.Exists)
-			{
-				file.Directory.Create();
-			}
+			new FileInfo(path).Directory?.Create();
 
 			// Make backup first
 			if (Config.Savestates.MakeBackups)
@@ -4462,12 +4453,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 
 			var path = Config.PathEntries.SaveStateAbsolutePath(Game.System);
-
-			var file = new FileInfo(path);
-			if (file.Directory != null && !file.Directory.Exists)
-			{
-				file.Directory.Create();
-			}
+			new FileInfo(path).Directory?.Create();
 
 			var result = this.ShowFileSaveDialog(
 				fileExt: "State",
diff --git a/src/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/src/BizHawk.Client.EmuHawk/tools/ToolManager.cs
index 37dc08d5a1..a4001b6f61 100644
--- a/src/BizHawk.Client.EmuHawk/tools/ToolManager.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/ToolManager.cs
@@ -877,13 +877,7 @@ namespace BizHawk.Client.EmuHawk
 		public string GenerateDefaultCheatFilename()
 		{
 			var path = _config.PathEntries.CheatsAbsolutePath(_game.System);
-
-			var f = new FileInfo(path);
-			if (f.Directory != null && !f.Directory.Exists)
-			{
-				f.Directory.Create();
-			}
-
+			new FileInfo(path).Directory?.Create();
 			return Path.Combine(path, $"{_game.FilesystemSafeName()}.cht");
 		}
 
diff --git a/src/BizHawk.Client.EmuHawk/tools/TraceLogger.cs b/src/BizHawk.Client.EmuHawk/tools/TraceLogger.cs
index 3d7d4fbeae..912bf1d3d6 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TraceLogger.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/TraceLogger.cs
@@ -426,10 +426,7 @@ namespace BizHawk.Client.EmuHawk
 				var name = Game.FilesystemSafeName();
 				var filename = Path.Combine(Config.PathEntries.LogAbsolutePath(), name) + _extension;
 				LogFile = new FileInfo(filename);
-				if (LogFile.Directory != null && !LogFile.Directory.Exists)
-				{
-					LogFile.Directory.Create();
-				}
+				LogFile.Directory?.Create();
 
 				// never delete, especially from ticking checkboxes
 				// append = false is enough, and even that only happens when actually enabling logging