ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve error message shown for malformed `.bk2`/`.tasproj` 

of course I didn't test it
This commit is contained in:
YoshiRulz 2023-03-13 03:22:50 +10:00
parent 5be9e03a30
commit 51dab92826
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs
View File

@ -37,18 +37,20 @@ namespace BizHawk.Client.Common
return false; return false;
} }
using var bl = ZipStateLoader.LoadAndDetect(Filename, true); try
if (bl == null)
{ {
return false; using var bl = ZipStateLoader.LoadAndDetect(Filename, true);
} if (bl is null) return false;
ClearBeforeLoad(); ClearBeforeLoad();
LoadFields(bl, preload); LoadFields(bl, preload);
Changes = false; Changes = false;
return true; return true;
} }
catch (InvalidDataException e) when (e.StackTrace.Contains("ZipArchive.ReadEndOfCentralDirectory"))
{
throw new Exception("Archive appears to be corrupt. Make a backup, then try to repair it with e.g. 7-Zip.", e);
}
}
public bool PreLoadHeaderAndLength() => Load(true); public bool PreLoadHeaderAndLength() => Load(true);