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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BizHawk.Client.EmuHawk/MainForm.Movie.cs
View File

@ -20,15 +20,15 @@ namespace BizHawk.Client.EmuHawk
Global.Config.RecentMovies.Add(movie.Filename); 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 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(); Global.Emulator.ResetCounters();

12
BizHawk.Client.EmuHawk/movie/RecordMovie.cs
View File

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