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

Revert "TAStudio: Update self after loading a state. There doesn't seem to be any reason to not update TAStudio, and doing so fixes two bugs that were most evident when loading the state for frame 0:" 

This reverts commit bb226f694a.

This regressed #2965. Will attempt a different fix for the mentioned issues that doesn't regress anything.
This commit is contained in:
Morilli 2022-01-26 10:56:43 +01:00
parent 937b966393
commit 319455c2ea
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs
View File

@ -19,6 +19,7 @@ namespace BizHawk.Client.EmuHawk
[OptionalService]
public ISaveRam SaveRamEmulator { get; private set; }
private bool _hackyDontUpdate;
private bool _initializing; // If true, will bypass restart logic, this is necessary since loading projects causes a movie to load which causes a rom to reload causing dialogs to restart
private int _lastRefresh;
@ -66,6 +67,11 @@ namespace BizHawk.Client.EmuHawk
return;
}
if (_hackyDontUpdate)
{
return;
}
if (_exiting)
{
return;

6
src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
View File

@ -961,16 +961,18 @@ namespace BizHawk.Client.EmuHawk
Emulator.ResetCounters();
}
UpdateTools();
UpdateOtherTools();
}
public void AddBranchExternal() => BookMarkControl.AddBranchExternal();
public void RemoveBranchExternal() => BookMarkControl.RemoveBranchExternal();
private void UpdateTools()
private void UpdateOtherTools() // a hack probably, surely there is a better way to do this
{
_hackyDontUpdate = true;
Tools.UpdateToolsBefore();
Tools.UpdateToolsAfter();
_hackyDontUpdate = false;
}
public void TogglePause()