From 7f45b4880fc737b4b9a9c4cbb5f90352ccd7e536 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 27 May 2017 14:44:45 -0500
Subject: [PATCH] c64 - another savestate fix

---
 BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6510.cs  | 3 +++
 .../Computers/Commodore64/Serial/Drive1541.cs                  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6510.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6510.cs
index 7605d704e3..8beee67a4d 100644
--- a/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6510.cs
+++ b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6510.cs
@@ -218,7 +218,10 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
 
 		public void SyncState(Serializer ser)
 		{
+			ser.BeginSection("Chip6510Cpu");
 			_cpu.SyncState(ser);
+			ser.EndSection();
+
 			ser.Sync("_pinNmiLast", ref _pinNmiLast);
 
 			ser.BeginSection("_port");
diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.cs
index 14437cde11..8b1e60fc55 100644
--- a/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.cs
+++ b/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.cs
@@ -89,7 +89,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.Serial
 			ser.Sync("SystemCpuClockNumerator", ref _cpuClockNum);
 			ser.Sync("SystemDriveCpuRatioDifference", ref _ratioDifference);
 			ser.Sync("DriveLightOffTime", ref _driveLightOffTime);
-			ser.Sync("TrackImageData", ref _trackImageData[1]);
+			ser.Sync("TrackImageData", ref _trackImageData, useNull: false);
 
 			ser.Sync("DiskDensityCounter", ref _diskDensityCounter);
 			ser.Sync("DiskSupplementaryCounter", ref _diskSupplementaryCounter);