From 26fb9b9694b4360f9aa6d7ec361d17a52b342bde Mon Sep 17 00:00:00 2001
From: SuuperW <SuuperW@gmail.com>
Date: Fri, 15 Jan 2021 17:47:57 -0600
Subject: [PATCH] InputRoll: fix comparing of cells with null column names

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

diff --git a/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/Cell.cs b/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/Cell.cs
index 268f1bf4e4..e12f8167a8 100644
--- a/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/Cell.cs
+++ b/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/Cell.cs
@@ -71,7 +71,7 @@ namespace BizHawk.Client.EmuHawk
 				{
 					int row = c1.RowIndex.Value.CompareTo(c2.RowIndex.Value);
 					return row == 0
-						? c1.Column.Name.CompareTo(c2.Column.Name)
+						? string.Compare(c1.Column?.Name, c2.Column?.Name)
 						: row;
 				}