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

Fixed Multitrack-load crash. 

Also, read-only can't be toggled while no movie active. 
Same for multitrack.
This commit is contained in:
kylethomson 2011-08-17 02:06:50 +00:00
parent c5f2d02f68
commit 2243c7dcad
3 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
BizHawk.MultiClient/MainForm.cs
View File

@ -1394,16 +1394,23 @@ namespace BizHawk.MultiClient
case "Toggle MultiTrack": case "Toggle MultiTrack":
{ {
Global.MovieSession.MultiTrack.IsActive = !Global.MovieSession.MultiTrack.IsActive; if (Global.MainForm.UserMovie.Mode > MOVIEMODE.INACTIVE)
if (Global.MovieSession.MultiTrack.IsActive)
{ {
Global.RenderPanel.AddMessage("MultiTrack Enabled"); Global.MovieSession.MultiTrack.IsActive = !Global.MovieSession.MultiTrack.IsActive;
Global.RenderPanel.MT = "Recording None"; if (Global.MovieSession.MultiTrack.IsActive)
{
Global.RenderPanel.AddMessage("MultiTrack Enabled");
Global.RenderPanel.MT = "Recording None";
}
else
Global.RenderPanel.AddMessage("MultiTrack Disabled");
Global.MovieSession.MultiTrack.RecordAll = false;
Global.MovieSession.MultiTrack.CurrentPlayer = 0;
} }
else else
Global.RenderPanel.AddMessage("MultiTrack Disabled"); {
Global.MovieSession.MultiTrack.RecordAll = false; Global.RenderPanel.AddMessage("MultiTrack cannot be enabled while not recording.");
Global.MovieSession.MultiTrack.CurrentPlayer = 0; }
break; break;
} }
case "Increment Player": case "Increment Player":
@ -2140,11 +2147,19 @@ namespace BizHawk.MultiClient
public void ToggleReadOnly() public void ToggleReadOnly()
{ {
ReadOnly ^= true; if (Global.MainForm.UserMovie.Mode > MOVIEMODE.INACTIVE)
if (ReadOnly) {
Global.RenderPanel.AddMessage("Movie read-only mode"); ReadOnly ^= true;
if (ReadOnly)
Global.RenderPanel.AddMessage("Movie read-only mode");
else
Global.RenderPanel.AddMessage("Movie read+write mode");
}
else else
Global.RenderPanel.AddMessage("Movie read+write mode"); {
Global.RenderPanel.AddMessage("No movie active");
}
} }
public void SetReadOnly(bool read_only) public void SetReadOnly(bool read_only)

3
BizHawk.MultiClient/movie/Movie.cs
View File

@ -326,8 +326,7 @@ namespace BizHawk.MultiClient
public void LoadLogFromSavestateText(TextReader reader) public void LoadLogFromSavestateText(TextReader reader)
{ {
//We are in record mode so replace the movie log with the one from the savestate //We are in record mode so replace the movie log with the one from the savestate
Global.MovieSession.MultiTrack.IsActive = false; //adelikat: Hack because this is causing crashes by being true when it shouldn't!
if (!Global.MovieSession.MultiTrack.IsActive) if (!Global.MovieSession.MultiTrack.IsActive)
{ {
if (Global.Config.EnableBackupMovies && MakeBackup && Log.Length() > 0) if (Global.Config.EnableBackupMovies && MakeBackup && Log.Length() > 0)

2
BizHawk.MultiClient/movie/MovieLog.cs
View File

@ -40,7 +40,7 @@ namespace BizHawk.MultiClient
if (MovieRecords.Count > frameNum) if (MovieRecords.Count > frameNum)
MovieRecords[frameNum] = frame; MovieRecords[frameNum] = frame;
else else
MovieRecords.Insert(frameNum, frame); MovieRecords.Add(frame);
} }
public void AddFrameAt(string frame, int frameNum) public void AddFrameAt(string frame, int frameNum)
{ {