diff --git a/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs b/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs index 5342a80a0d..ac75a5e49e 100644 --- a/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs +++ b/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs @@ -9,20 +9,14 @@ namespace BizHawk.Client.Common { private Bk2ControllerAdapter _adapter; - public Bk2Movie(string filename) - : this() - { - Rerecords = 0; - Filename = filename; - } - - public Bk2Movie() + public Bk2Movie(string filename = null) { Subtitles = new SubtitleList(); Comments = new List(); - Filename = ""; + Filename = filename ?? string.Empty; IsCountingRerecords = true; + if (filename != null) Rerecords = 0; Mode = MovieMode.Inactive; MakeBackup = true; diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs index a48b546b6a..8053609d4c 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs @@ -47,28 +47,7 @@ namespace BizHawk.Client.Common }; /// loaded core does not implement - public TasMovie(string path, bool startsFromSavestate = false) - : base(path) - { - // TODO: how to call the default constructor AND the base(path) constructor? And is base(path) calling base() ? - if (!Global.Emulator.HasSavestates()) - { - throw new InvalidOperationException($"Cannot create a {nameof(TasMovie)} against a core that does not implement {nameof(IStatable)}"); - } - - ChangeLog = new TasMovieChangeLog(this); - TasStateManager = new TasStateManager(this); - Session = new TasSession(this); - Header[HeaderKeys.MOVIEVERSION] = "BizHawk v2.0 Tasproj v1.0"; - Markers = new TasMovieMarkerList(this); - Markers.CollectionChanged += Markers_CollectionChanged; - Markers.Add(0, startsFromSavestate ? "Savestate" : "Power on"); - BindMarkersToInput = false; - CurrentBranch = -1; - } - - /// loaded core does not implement - public TasMovie(bool startsFromSavestate = false) + public TasMovie(string path = null, bool startsFromSavestate = false) : base(path) { if (!Global.Emulator.HasSavestates()) { diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index c08558a2b6..1fc18e0037 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -555,7 +555,7 @@ namespace BizHawk.Client.EmuHawk return false; } - TasMovie newMovie = new TasMovie(startsFromSavestate); + TasMovie newMovie = new TasMovie(startsFromSavestate: startsFromSavestate); newMovie.TasStateManager.InvalidateCallback = GreenzoneInvalidated; newMovie.Filename = file.FullName;