From 2b59cfc1c49b7e1a90181ef8485f6c43db7fd5e8 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Sun, 7 Aug 2022 16:20:37 +1000
Subject: [PATCH] Small refactor in `DiscMountJob.RunBizHawk`

---
 .../DiscMountJob.cs                           | 30 +++++++------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/src/BizHawk.Emulation.DiscSystem/DiscMountJob.cs b/src/BizHawk.Emulation.DiscSystem/DiscMountJob.cs
index 1e0e17ae47..df512065ef 100644
--- a/src/BizHawk.Emulation.DiscSystem/DiscMountJob.cs
+++ b/src/BizHawk.Emulation.DiscSystem/DiscMountJob.cs
@@ -189,25 +189,17 @@ namespace BizHawk.Emulation.DiscSystem
 					LoadCue(Path.GetDirectoryName(IN_FromPath), File.ReadAllText(IN_FromPath));
 					break;
 				case ".iso":
-					{
-						// make a fake .cue file to represent this .iso and mount that
-						//however... to save many users from a stupid mistake, check if the size is NOT a multiple of 2048 (but IS a multiple of 2352) and in that case consider it a mode2 disc
-						//TODO - try it both ways and check the disc type to use whichever one succeeds in identifying a disc type
-						var len = new FileInfo(IN_FromPath).Length;
-						string mode1cue = $@"
-						FILE ""{Path.GetFileName(IN_FromPath)}"" BINARY
-							TRACK 01 MODE1/2048
-								INDEX 01 00:00:00";
-						string mode2cue = $@"
-						FILE ""{Path.GetFileName(IN_FromPath)}"" BINARY
-							TRACK 01 MODE2/2352
-								INDEX 01 00:00:00";
-						if (len % 2048 != 0 && len % 2352 == 0)
-							LoadCue(Path.GetDirectoryName(IN_FromPath), mode2cue);
-						else
-							LoadCue(Path.GetDirectoryName(IN_FromPath), mode1cue);
-						break;
-					}
+					// make a fake .cue file to represent this .iso and mount that
+					// however... to save many users from a stupid mistake, check if the size is NOT a multiple of 2048 (but IS a multiple of 2352) and in that case consider it a mode2 disc
+					//TODO try it both ways and check the disc type to use whichever one succeeds in identifying a disc type
+					var len = new FileInfo(IN_FromPath).Length;
+					LoadCue(
+						Path.GetDirectoryName(IN_FromPath),
+						$@"
+					FILE ""{Path.GetFileName(IN_FromPath)}"" BINARY
+						TRACK 01 {(len % 2048 is not 0 && len % 2352 is 0 ? "MODE2/2352" : "MODE1/2048")}
+							INDEX 01 00:00:00");
+					break;
 				case ".mds":
 					OUT_Disc = new MDS_Format().LoadMDSToDisc(IN_FromPath, IN_DiscMountPolicy);
 					break;