diff --git a/src/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs b/src/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs index 613cadba58..d27ca4ae40 100644 --- a/src/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs +++ b/src/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs @@ -167,8 +167,17 @@ namespace BizHawk.Client.Common bl.GetLump(BinaryStateLump.StateHistory, false, delegate(BinaryReader br, long length) { - TasStateManager?.Dispose(); - TasStateManager = ZwinderStateManager.Create(br, settings, IsReserved); + try + { + TasStateManager?.Dispose(); + TasStateManager = ZwinderStateManager.Create(br, settings, IsReserved); + } + catch + { + // Do nothing, if state history got corrupted, the file is still very much useable + // and we would want the user to be able to load, and regenerate their state history + // however, we still have an issue of how state history got corrupted + } }); } }