From cbc5ca21154779312c50987702bffbe7d7ae8ddb Mon Sep 17 00:00:00 2001
From: feos <feos-theos@yandex.ru>
Date: Sat, 11 Jun 2016 18:58:22 +0300
Subject: [PATCH] tastudio: fix the warning about inheritance mismatch

---
 .../movie/tasproj/TasMovieMarker.cs           | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovieMarker.cs b/BizHawk.Client.Common/movie/tasproj/TasMovieMarker.cs
index 7e1832e6b0..c2054f51a5 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasMovieMarker.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasMovieMarker.cs
@@ -109,7 +109,13 @@ namespace BizHawk.Client.Common
 			return sb.ToString();
 		}
 
-		public new void Add(TasMovieMarker item, bool fromHistory = false)
+		// the inherited one
+		public new void Add(TasMovieMarker item)
+		{
+			Add(item, false);
+		}
+
+		public void Add(TasMovieMarker item, bool fromHistory)
 		{
 			var existingItem = this.FirstOrDefault(m => m.Frame == item.Frame);
 			if (existingItem != null)
@@ -148,7 +154,13 @@ namespace BizHawk.Client.Common
 				_movie.ChangeLog.EndBatch();
 		}
 
-		public new void Insert(int index, TasMovieMarker item, bool fromHistory = false)
+		// the inherited one
+		public new void Insert(int index, TasMovieMarker item)
+		{
+			Insert(index, item, false);
+		}
+
+		public void Insert(int index, TasMovieMarker item, bool fromHistory)
 		{
 			if (!fromHistory)
 				_movie.ChangeLog.AddMarkerChange(item);
@@ -170,7 +182,13 @@ namespace BizHawk.Client.Common
 			OnListChanged(NotifyCollectionChangedAction.Add);
 		}
 
-		public new void Remove(TasMovieMarker item, bool fromHistory = false)
+		// the inherited one
+		public new void Remove(TasMovieMarker item)
+		{
+			Remove(item, false);
+		}
+
+		public void Remove(TasMovieMarker item, bool fromHistory)
 		{
 			if (item == null || item.Frame == 0) // TODO: Don't do this.
 				return;