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

fix Tastudio .tasproj loading broken in previous commits (this code is a mess), MovieSession - remove setter on Movie property

This commit is contained in:
adelikat 2020-04-18 15:37:43 -05:00
parent 56cc1fefff
commit 918fbe6367
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.Common/movie/MovieSession.cs
View File

@ -38,7 +38,7 @@ namespace BizHawk.Client.Common
Movie = MovieService.DefaultInstance;
}
public IMovie Movie { get; set; }
public IMovie Movie { get; private set; }
public bool ReadOnly { get; set; } = true;
public bool NewMovieQueued => _queuedMovie != null;
public string QueuedSyncSettings => _queuedMovie.SyncSettingsJson;

2
BizHawk.Client.Common/movie/interfaces/IMovieSession.cs
View File

@ -5,7 +5,7 @@ namespace BizHawk.Client.Common
{
public interface IMovieSession
{
IMovie Movie { get; set; }
IMovie Movie { get; }
bool ReadOnly { get; set; }
/// <summary>

4
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
View File

@ -703,8 +703,6 @@ namespace BizHawk.Client.EmuHawk
SetTasMovieCallbacks(tasMovie);
tasMovie.ClearChanges(); // Don't ask to save changes here.
MovieSession.Movie = tasMovie;
if (HandleMovieLoadStuff(tasMovie))
{
CurrentTasMovie.TasStateManager.Capture(); // Capture frame 0 always.
@ -750,7 +748,9 @@ namespace BizHawk.Client.EmuHawk
SetTasMovieCallbacks(movie);
SuspendLayout();
bool result = MainForm.StartNewMovie(movie, false);
ResumeLayout();
if (result)
{
CurrentTasMovie.TasStateManager.Capture(); // Capture frame 0 always.