From 641b67e1ccb9e72bdd499a330a9a4bd08c0294f6 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Mon, 13 Jul 2015 16:07:34 -0500
Subject: [PATCH] psx - properly dispose resources used by core

---
 .../Consoles/Sony/PSX/Octoshock.cs                 | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
index 75db10fd13..c67dd6101f 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
@@ -122,13 +122,19 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
 		{
 			if (disposed) return;
 
+			disposed = true;
+
+			//discs arent bound to shock core instances, but they may be mounted. kill the core instance first to effectively dereference the disc
 			OctoshockDll.shock_Destroy(psx);
 			psx = IntPtr.Zero;
 
-			disposed = true;
-
-			//TODO - dispose disc wrappers
-			//TODO - dispose discs
+			//destroy all discs we're managing (and the unmanaged octoshock resources)
+			foreach (var di in discInterfaces)
+			{
+				di.Disc.Dispose();
+				di.Dispose();
+			}
+			discInterfaces.Clear();
 		}
 
 		/// <summary>