From 0a290fa7567226595f1330171e065704420a276f Mon Sep 17 00:00:00 2001 From: zeromus Date: Thu, 24 Jun 2021 19:19:51 -0400 Subject: [PATCH] someone added a "Can't find the file specified: cue filename" for when ANY error happened (including when bin files couldn't be found), before the error message which would have said "Can't find the bin file specified by the cue file". probably while doing null-related refactor bullshit because they had to throw some exception instead of adopting a null value. fix that by undoing the null-related refactor bullshit and adopting the value which is known not to be null (to us, if not the nagging linter) after checking for the intended error conditions and throwing if they're set. fixes #2819 (probably) --- src/BizHawk.Emulation.DiscSystem/DiscExtensions.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/BizHawk.Emulation.DiscSystem/DiscExtensions.cs b/src/BizHawk.Emulation.DiscSystem/DiscExtensions.cs index 421e12490b..b8b1166723 100644 --- a/src/BizHawk.Emulation.DiscSystem/DiscExtensions.cs +++ b/src/BizHawk.Emulation.DiscSystem/DiscExtensions.cs @@ -18,8 +18,7 @@ namespace BizHawk.Emulation.DiscSystem //--- load the disc in a context which will let us abort if it's going to take too long var discMountJob = new DiscMountJob(fromPath: path, slowLoadAbortThreshold: 8); discMountJob.Run(); - var disc = discMountJob.OUT_Disc ?? throw new InvalidOperationException($"Can't find the file specified: {path}"); - + if (discMountJob.OUT_SlowLoadAborted) { errorCallback("This disc would take too long to load. Run it through DiscoHawk first, or find a new rip because this one is probably junk"); @@ -31,6 +30,8 @@ namespace BizHawk.Emulation.DiscSystem throw new InvalidOperationException($"\r\n{discMountJob.OUT_Log}"); } + var disc = discMountJob.OUT_Disc; + var discType = new DiscIdentifier(disc).DetectDiscType(); if (type.HasValue && discType != type)