Fix oopsie

This commit is contained in:
goyuken 2015-05-20 00:12:19 +00:00
parent ef20ef1991
commit facee4e113
2 changed files with 6 additions and 11 deletions

View File

@ -14,6 +14,11 @@ namespace Jellyfish.Virtu
{ {
public sealed class Machine : IDisposable public sealed class Machine : IDisposable
{ {
/// <summary>
/// for deserialization only!!
/// </summary>
public Machine() { }
public Machine(byte[] appleIIe, byte[] diskIIRom) public Machine(byte[] appleIIe, byte[] diskIIRom)
{ {
Events = new MachineEvents(); Events = new MachineEvents();
@ -156,17 +161,7 @@ namespace Jellyfish.Virtu
public static Machine Deserialize(JsonReader r) public static Machine Deserialize(JsonReader r)
{ {
var ret = CreateSerializer().Deserialize<Machine>(r); return CreateSerializer().Deserialize<Machine>(r);
// for some unknown reason, these particular references get nuked by JSON.NET on deserializating
foreach (var c in ret.Components)
{
c.Machine = ret;
}
ret.BootDiskII.Drive1.Machine = ret;
ret.BootDiskII.Drive2.Machine = ret;
return ret;
} }
public const string Version = "0.9.4.0"; public const string Version = "0.9.4.0";

Binary file not shown.