From ec07983f929cf29df4ae4a4bdb585b151f449787 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 13 May 2017 11:42:39 -0500
Subject: [PATCH] Refactor Disk.cs to not use SyncObject, still uses SyncDelta
 however

---
 BizHawk.Emulation.Cores/Computers/Commodore64/Media/Disk.cs  | 5 +++--
 .../Computers/Commodore64/Serial/Drive1541.cs                | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/Media/Disk.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Media/Disk.cs
index ee1ce33cd1..3f119ed811 100644
--- a/BizHawk.Emulation.Cores/Computers/Commodore64/Media/Disk.cs
+++ b/BizHawk.Emulation.Cores/Computers/Commodore64/Media/Disk.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
+
 using BizHawk.Common;
 
 namespace BizHawk.Emulation.Cores.Computers.Commodore64.Media
@@ -162,6 +162,8 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.Media
 
 		public void SyncState(Serializer ser)
 		{
+			ser.Sync("WriteProtected", ref WriteProtected);
+
 			if (ser.IsReader)
 			{
 				var mediaState = new int[_originalMedia.Length];
@@ -173,7 +175,6 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.Media
 				var mediaState = SerializeTracks(_tracks);
 				SaveState.SyncDelta("MediaState", ser, _originalMedia, ref mediaState);
 			}
-			SaveState.SyncObject(ser, this);
 		}
 	}
 }
diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.cs
index 0bbda93ceb..8a5bd16c6c 100644
--- a/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.cs
+++ b/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.cs
@@ -80,7 +80,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.Serial
 		public override void SyncState(Serializer ser)
 		{
 			ser.BeginSection("Disk");
-			_disk.SyncState(ser); // TODO
+			_disk.SyncState(ser);
 			ser.EndSection();
 
 			ser.Sync("BitHistory", ref _bitHistory);