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

Neshawk - fix crash on start up caused my memory domain refactor

This commit is contained in:
adelikat 2015-01-15 15:52:52 +00:00
parent 4272a954cf
commit 69c547bdd7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs
View File

@ -26,6 +26,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
[CoreConstructor("NES")] [CoreConstructor("NES")]
public NES(CoreComm comm, GameInfo game, byte[] rom, object Settings, object SyncSettings) public NES(CoreComm comm, GameInfo game, byte[] rom, object Settings, object SyncSettings)
{ {
var ser = new BasicServiceProvider(this);
ServiceProvider = ser;
byte[] fdsbios = comm.CoreFileProvider.GetFirmware("NES", "Bios_FDS", false); byte[] fdsbios = comm.CoreFileProvider.GetFirmware("NES", "Bios_FDS", false);
if (fdsbios != null && fdsbios.Length == 40976) if (fdsbios != null && fdsbios.Length == 40976)
{ {
@ -50,7 +53,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
} }
PutSettings((NESSettings)Settings ?? new NESSettings()); PutSettings((NESSettings)Settings ?? new NESSettings());
var ser = new BasicServiceProvider(this);
ser.Register<IDisassemblable>(cpu); ser.Register<IDisassemblable>(cpu);
Tracer = new TraceBuffer(); Tracer = new TraceBuffer();
@ -64,8 +67,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
if (reader != null) if (reader != null)
ser.Register<DatachBarcode>(reader); ser.Register<DatachBarcode>(reader);
} }
ServiceProvider = ser;
} }
public IEmulatorServiceProvider ServiceProvider { get; private set; } public IEmulatorServiceProvider ServiceProvider { get; private set; }