Fixing Recording from "now", for the 500th time

This commit is contained in:
adelikat 2014-08-16 15:01:53 +00:00
parent db0dd17676
commit 3880c45398
2 changed files with 10 additions and 10 deletions

View File

@ -20,15 +20,15 @@ namespace BizHawk.Client.EmuHawk
Global.Config.RecentMovies.Add(movie.Filename);
if (Global.MovieSession.Movie.StartsFromSavestate)
if (movie.StartsFromSavestate)
{
if (Global.MovieSession.Movie.TextSavestate != null)
if (movie.TextSavestate != null)
{
Global.Emulator.LoadStateText(new StringReader(Global.MovieSession.Movie.TextSavestate));
Global.Emulator.LoadStateText(new StringReader(movie.TextSavestate));
}
else
{
Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(Global.MovieSession.Movie.BinarySavestate, false)));
Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(movie.BinarySavestate, false)));
}
Global.Emulator.ResetCounters();

View File

@ -61,14 +61,14 @@ namespace BizHawk.Client.EmuHawk
var movieToRecord = MovieService.Get(path);
var fileInfo = new FileInfo(path);
if (!fileInfo.Exists)
{
Directory.CreateDirectory(fileInfo.DirectoryName);
}
if (StartFromCombo.SelectedItem.ToString() == "Now")
{
var fileInfo = new FileInfo(path);
if (!fileInfo.Exists)
{
Directory.CreateDirectory(fileInfo.DirectoryName);
}
movieToRecord.StartsFromSavestate = true;
if (Global.Emulator.BinarySaveStatesPreferred)