From 8449f9fcb8960c4bc8c9374997141135f334b79f Mon Sep 17 00:00:00 2001 From: RetroEdit <30182911+RetroEdit@users.noreply.github.com> Date: Mon, 28 Sep 2020 15:33:59 +0000 Subject: [PATCH] Firmware Manager: replace unnecessary gotos --- src/BizHawk.Client.Common/FirmwareManager.cs | 25 ++++++-------------- 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/src/BizHawk.Client.Common/FirmwareManager.cs b/src/BizHawk.Client.Common/FirmwareManager.cs index dec58e6f7b..08b825144c 100644 --- a/src/BizHawk.Client.Common/FirmwareManager.cs +++ b/src/BizHawk.Client.Common/FirmwareManager.cs @@ -41,27 +41,18 @@ namespace BizHawk.Client.Common public string FirmwareId { get; set; } } + + // purpose of forbidScan: sometimes this is called from a loop in Scan(). we don't want to repeatedly DoScanAndResolve in that case, its already been done. public ResolutionInfo Resolve(PathEntryCollection pathEntries, IDictionary userSpecifications, FirmwareDatabase.FirmwareRecord record, bool forbidScan = false) { - // purpose of forbidScan: sometimes this is called from a loop in Scan(). we don't want to repeatedly DoScanAndResolve in that case, its already been done. - bool first = true; - - RETRY: _resolutionDictionary.TryGetValue(record, out var resolved); - // couldn't find it! do a scan and resolve to try harder - // NOTE: this could result in bad performance in some cases if the scanning happens repeatedly.. - if (resolved == null && first) + // NOTE: this could result in bad performance in some cases if the scanning happens repeatedly... + if (resolved == null && !forbidScan) { - if (!forbidScan) - { - DoScanAndResolve(pathEntries, userSpecifications); - } - - first = false; - goto RETRY; + DoScanAndResolve(pathEntries, userSpecifications); + _resolutionDictionary.TryGetValue(record, out resolved); } - return resolved; } @@ -207,11 +198,9 @@ namespace BizHawk.Client.Common Size = fo.Size }; _resolutionDictionary[fr] = ri; - goto DONE_FIRMWARE; + break; } } - - DONE_FIRMWARE: ; } // apply user overrides