Add null check (#1874)

MobiFlight · Dec 15, 2024 · f431823 · f431823
1 parent fa27040
commit f431823
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/UI/Panels/InputConfigPanel.cs b/UI/Panels/InputConfigPanel.cs
@@ -327,7 +327,8 @@ private void dataGridViewConfig_KeyUp(object sender, KeyEventArgs e)
             {
 
                 // handle clicks on header cells or row-header cells
-                if (dgv.CurrentRow.Index < 0 || dgv.CurrentCell.ColumnIndex < 0) return;
+                // Issue 1863: Check for null (nothing in the grid) so there's no crash
+                if (dgv.CurrentRow == null || dgv.CurrentRow.Index < 0 || dgv.CurrentCell.ColumnIndex < 0) return;
 
                 dgv.CurrentCell = dgv[cellIndex, dgv.CurrentRow.Index];
 

diff --git a/UI/Panels/OutputConfigPanel.cs b/UI/Panels/OutputConfigPanel.cs
@@ -349,7 +349,8 @@ private void DataGridViewConfig_KeyUp(object sender, KeyEventArgs e)
             {
 
                 // handle clicks on header cells or row-header cells
-                if (dgv.CurrentRow.Index < 0 || dgv.CurrentCell.ColumnIndex < 0) return;
+                // Issue 1863: Check for null (nothing in the grid) so there's no crash
+                if (dgv.CurrentRow == null || dgv.CurrentRow.Index < 0 || dgv.CurrentCell.ColumnIndex < 0) return;
 
                 dgv.CurrentCell = dgv[cellIndex, dgv.CurrentRow.Index];