m64p: exec breakpoint occurs, but freezes in HackyPinvokeWaitOne()

This commit is contained in:
feos 2016-08-12 00:35:52 +03:00
parent 640911db33
commit dc68b90cd0
2 changed files with 9 additions and 5 deletions

View File

@ -60,7 +60,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
throw new NotImplementedException();
}
public IMemoryCallbackSystem MemoryCallbacks { get; private set; }
public IMemoryCallbackSystem MemoryCallbacks
{
get { return _memorycallbacks; }
}
private readonly MemoryCallbackSystem _memorycallbacks = new MemoryCallbackSystem();
public bool CanStep(StepType type) { return false; }

View File

@ -55,10 +55,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
{
ServiceProvider = new BasicServiceProvider(this);
InputCallbacks = new InputCallbackSystem();
MemoryCallbacks = new MemoryCallbackSystem
{
ExecuteCallbacksAvailable = false
};
_memorycallbacks.ActiveChanged += RefreshMemoryCallbacks;
int SaveType = 0;
if (game.OptionValue("SaveType") == "EEPROM_16K")
@ -215,6 +212,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
public void FrameAdvance(bool render, bool rendersound)
{
IsVIFrame = false;
RefreshMemoryCallbacks();
_audioProvider.RenderSound = rendersound;