From 9d3888a8a485a01c2404a7e915ead969098e3e36 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Sun, 19 Jul 2015 11:56:18 -0500
Subject: [PATCH] disc - restore intended crash-free handling of slow loading
 abort

---
 BizHawk.Emulation.DiscSystem/DiscMountJob.cs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/BizHawk.Emulation.DiscSystem/DiscMountJob.cs b/BizHawk.Emulation.DiscSystem/DiscMountJob.cs
index 3d9bf0271e..50e5f885ee 100644
--- a/BizHawk.Emulation.DiscSystem/DiscMountJob.cs
+++ b/BizHawk.Emulation.DiscSystem/DiscMountJob.cs
@@ -180,15 +180,18 @@ namespace BizHawk.Emulation.DiscSystem
 				OUT_Disc = ccdLoader.LoadCCDToDisc(IN_FromPath, IN_DiscMountPolicy);
 			}
 
-		DONE: ;
+		DONE:
 
 			//setup the lowest level synth provider
-			var sssp = new ArraySectorSynthProvider()
+			if (OUT_Disc != null)
 			{
-				Sectors = OUT_Disc._Sectors,
-				FirstLBA = -150
-			};
-			OUT_Disc.SynthProvider = sssp;
+				var sssp = new ArraySectorSynthProvider()
+				{
+					Sectors = OUT_Disc._Sectors,
+					FirstLBA = -150
+				};
+				OUT_Disc.SynthProvider = sssp;
+			}
 		}
 	}