From 4e8069a9fb91fde5537947bc093458097ff84d28 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 10 Jan 2015 15:59:15 +0000
Subject: [PATCH] When dropping a movie with no rom loaded and the user cancels
 the open rom dialog, don't throw an error message, simply quietly cancel the
 drop

---
 BizHawk.Client.EmuHawk/MainForm.Events.cs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index 9d566270b8..4504958fc2 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -2410,6 +2410,11 @@ namespace BizHawk.Client.EmuHawk
 					OpenRom();
 				}
 
+				if (Global.Emulator.IsNull())
+				{
+					return;
+				}
+
 				StartNewMovie(MovieService.Get(filePaths[0]), false);
 			}
 			else if (ext.ToUpper() == ".STATE")
@@ -2440,6 +2445,11 @@ namespace BizHawk.Client.EmuHawk
 					OpenRom();
 				}
 
+				if (Global.Emulator.IsNull())
+				{
+					return;
+				}
+
 				// tries to open a legacy movie format by importing it
 				string errorMsg;
 				string warningMsg;