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

tastudio: fix marker copies being recorded to history when branch backup is created

This commit is contained in:
feos 2017-05-29 21:20:46 +03:00
parent 6bc542cc56
commit 2e519eda05
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
BizHawk.Client.Common/movie/tasproj/TasMovieMarker.cs
View File

@ -84,7 +84,8 @@ namespace BizHawk.Client.Common
var ret = new TasMovieMarkerList(_movie);
for (int i = 0; i < Count; i++)
{
ret.Add(new TasMovieMarker(this[i].Frame, this[i].Message));
// used to copy markers between branches
ret.Add(new TasMovieMarker(this[i].Frame, this[i].Message), skipHistory: true);
}
return ret;
@ -115,14 +116,14 @@ namespace BizHawk.Client.Common
Add(item, false);
}
public void Add(TasMovieMarker item, bool fromHistory)
public void Add(TasMovieMarker item, bool skipHistory)
{
var existingItem = this.FirstOrDefault(m => m.Frame == item.Frame);
if (existingItem != null)
{
if (existingItem.Message != item.Message)
{
if (!fromHistory)
if (!skipHistory)
{
_movie.ChangeLog.AddMarkerChange(item, item.Frame, existingItem.Message);
}
@ -133,7 +134,7 @@ namespace BizHawk.Client.Common
}
else
{
if (!fromHistory)
if (!skipHistory)
{
_movie.ChangeLog.AddMarkerChange(item);
}