TasMovie - don't use a field value unnecessarily

This commit is contained in:
adelikat 2020-06-03 17:07:12 -05:00
parent 2cc106de98
commit 246d7ec2d5
1 changed files with 6 additions and 10 deletions

View File

@ -174,8 +174,6 @@ namespace BizHawk.Client.Common
public IStringLog GetLogEntries() => Log; public IStringLog GetLogEntries() => Log;
private int? _timelineBranchFrame;
// TODO: this is 99% copy pasting of bad code // TODO: this is 99% copy pasting of bad code
public override bool ExtractInputLog(TextReader reader, out string errorMessage) public override bool ExtractInputLog(TextReader reader, out string errorMessage)
{ {
@ -183,12 +181,10 @@ namespace BizHawk.Client.Common
int? stateFrame = null; int? stateFrame = null;
var newLog = new List<string>(); var newLog = new List<string>();
int? timelineBranchFrame = null;
// 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
if (!Global.MovieSession.MultiTrack.IsActive) if (!Global.MovieSession.MultiTrack.IsActive)
{ {
_timelineBranchFrame = null;
if (Global.Config.Movies.EnableBackupMovies && MakeBackup && Log.Count != 0) if (Global.Config.Movies.EnableBackupMovies && MakeBackup && Log.Count != 0)
{ {
SaveBackup(); SaveBackup();
@ -237,9 +233,9 @@ namespace BizHawk.Client.Common
else if (line[0] == '|') else if (line[0] == '|')
{ {
newLog.Add(line); newLog.Add(line);
if (!_timelineBranchFrame.HasValue && counter < Log.Count && line != Log[counter]) if (!timelineBranchFrame.HasValue && counter < Log.Count && line != Log[counter])
{ {
_timelineBranchFrame = counter; timelineBranchFrame = counter;
} }
counter++; counter++;
@ -328,10 +324,10 @@ namespace BizHawk.Client.Common
Rerecords++; Rerecords++;
} }
if (_timelineBranchFrame.HasValue) if (timelineBranchFrame.HasValue)
{ {
LagLog.RemoveFrom(_timelineBranchFrame.Value); LagLog.RemoveFrom(timelineBranchFrame.Value);
TasStateManager.Invalidate(_timelineBranchFrame.Value); TasStateManager.Invalidate(timelineBranchFrame.Value);
} }
return true; return true;