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

Conisstently use MovieSession.StopMovie instead of stopping the movie directly, derefrence the movie on stopping instead of letting it hang around in memory

This commit is contained in:
adelikat 2020-04-18 13:43:30 -05:00
parent b2208d714c
commit 7a77861896
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.Common/Api/Classes/MovieApi.cs
View File

@ -125,7 +125,7 @@ namespace BizHawk.Client.Common
public void SetRerecordCounting(bool counting) => Global.MovieSession.Movie.IsCountingRerecords = counting;
public void Stop() => Global.MovieSession.Movie.Stop();
public void Stop() => Global.MovieSession.StopMovie();
public double GetFps()
{

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

@ -352,6 +352,7 @@ namespace BizHawk.Client.Common
MultiTrack.Restart(Global.Emulator.ControllerDefinition.PlayerCount);
_modeChangedCallback();
Movie = MovieService.DefaultInstance;
}
private void ClearFrame()

4
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -279,11 +279,9 @@ namespace BizHawk.Client.EmuHawk
if (Tools.AskSave())
{
// zero 03-nov-2015 - close game after other steps. tools might need to unhook themselves from a core.
MovieSession.Movie.Stop();
MovieSession.StopMovie();
Tools.Close();
CloseGame();
// does this need to be last for any particular reason? do tool dialogs persist settings when closing?
SaveConfig();
}
else

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

@ -830,7 +830,6 @@ namespace BizHawk.Client.EmuHawk
{
MainForm.PauseOnFrame = null;
MainForm.AddOnScreenMessage("TAStudio disengaged");
MovieSession.Movie = MovieService.DefaultInstance;
MainForm.TakeBackControl();
Config.MovieEndAction = _originalEndAction;
MainForm.SetMainformMovieInfo();