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

Tastudio - quick fix for crashing on startup, a better solution is needed eventually but this will work fine, it just isn't conceptually how we want to do things anymore

This commit is contained in:
adelikat 2014-12-21 23:53:40 +00:00
parent cad572262a
commit 6d0a764a72
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BizHawk.Client.Common/movie/tasproj/TasMovie.cs
View File

@ -31,9 +31,7 @@ namespace BizHawk.Client.Common
throw new InvalidOperationException("Cannot create a TasMovie against a core that does not implement IStatable");
}
var core = Global.Emulator.AsStatable();
StateManager = new TasStateManager(this, core);
StateManager = new TasStateManager(this);
Header[HeaderKeys.MOVIEVERSION] = "BizHawk v2.0 Tasproj v1.0";
Markers = new TasMovieMarkerList(this);
Markers.CollectionChanged += Markers_CollectionChanged;
@ -48,9 +46,7 @@ namespace BizHawk.Client.Common
throw new InvalidOperationException("Cannot create a TasMovie against a core that does not implement IStatable");
}
var core = Global.Emulator.AsStatable();
StateManager = new TasStateManager(this, core);
StateManager = new TasStateManager(this);
Header[HeaderKeys.MOVIEVERSION] = "BizHawk v2.0 Tasproj v1.0";
Markers = new TasMovieMarkerList(this);
Markers.CollectionChanged += Markers_CollectionChanged;

13
BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
View File

@ -16,7 +16,15 @@ namespace BizHawk.Client.Common
/// </summary>
public class TasStateManager
{
private readonly IStatable Core;
// TODO: pass this in, and find a solution to a stale reference (this is instantiated BEFORE a new core instance is made, making this one stale if it is simply set in the constructor
private IStatable Core
{
get
{
return Global.Emulator.AsStatable();
}
}
private readonly SortedList<int, byte[]> States = new SortedList<int, byte[]>();
private readonly TasMovie _movie;
@ -44,10 +52,9 @@ namespace BizHawk.Client.Common
}
}
public TasStateManager(TasMovie movie, IStatable core)
public TasStateManager(TasMovie movie)
{
_movie = movie;
Core = core;
Settings = new TasStateManagerSettings(Global.Config.DefaultTasProjSettings);