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

Merge pull request #1435 from TASVideos/mGBA_determinismbios 

EmuHawk: _LoadRom() - Change deterministic back to how it was before.
This commit is contained in:
Asnivor 2019-01-09 09:38:03 +00:00 committed by GitHub
parent 4a6a6079b0 4c5728dedb
commit ec89abd419
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3590,28 +3590,10 @@ namespace BizHawk.Client.EmuHawk
try try
{ {
bool deterministic;
if (args.Deterministic == null)
{
// force deterministic in this case
// this is usually null for most cores
// previously this was getting set to false if a movie was not queued for recording - surely that can't be good..
deterministic = true;
}
else
{
// a value was actually supplied somehow - use this
deterministic = args.Deterministic.Value;
}
if (Global.MovieSession.QueuedMovie != null)
{
// movies should require deterministic emulation in ALL cases // movies should require deterministic emulation in ALL cases
// if the core is managing its own DE through SyncSettings a 'deterministic' bool should be passed into the core's constructor // if the core is managing its own DE through SyncSettings a 'deterministic' bool can be passed into the core's constructor
// it is then up to the core itself to override its own local DeterministicEmulation setting // it is then up to the core itself to override its own local DeterministicEmulation setting
deterministic = true; bool deterministic = args.Deterministic ?? Global.MovieSession.QueuedMovie != null;
}
if (!GlobalWin.Tools.AskSave()) if (!GlobalWin.Tools.AskSave())
{ {