From f599b33ee2c7c639a3f9dffbf5799838929610d8 Mon Sep 17 00:00:00 2001
From: James Groom <OSSYoshiRulz@gmail.com>
Date: Sun, 21 Apr 2019 14:24:58 +0000
Subject: [PATCH] Don't change cell selection while context menu is open
 (resolves #1551)

---
 BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs b/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs
index e85de140a0..3cd63c326b 100644
--- a/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs
+++ b/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs
@@ -1196,7 +1196,7 @@ namespace BizHawk.Client.EmuHawk
 
 			if (AllowRightClickSelecton && e.Button == MouseButtons.Right)
 			{
-				if (!IsHoveringOnColumnCell)
+				if (!IsHoveringOnColumnCell && CurrentCell != null)
 				{
 					_currentX = e.X;
 					_currentY = e.Y;