Merge pull request #1307 from sillsdev/fix-error-in-better-grid

Fixed error in BetterGrid.OnCellContentClick

CHANGELOG.md

@@ -51,6 +51,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - [SIL.Windows.Forms] Spelling of `CreativeCommonsLicense.IntergovernmentalOrganizationQualifier`
 - [SIL.Windows.Forms] Fixed internationalization problem: SettingsProtection.LauncherButtonLabel was used as ID for two different strings.
 - [SIL.Windows.Forms] Fix 4 img metadata methods that could fail due to cloud or scanning interference
+- [SIL.Windows.Forms] Fixed error in BetterGrid.OnCellContentClick to make it so the delete button works correctly if there is no "new row."
 
 ### Removed
 

SIL.Windows.Forms/Widgets/BetterGrid/BetterGrid.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -600,7 +600,7 @@ protected override void OnCellContentClick(DataGridViewCellEventArgs e)
 				CommitEdit(DataGridViewDataErrorContexts.Commit);
 				EndEdit();
 			}
-			else if (e.RowIndex < NewRowIndex && RemoveRowAction != null && IsRemoveRowColumn(e.ColumnIndex))
+			else if (e.RowIndex < RowCountLessNewRow && RemoveRowAction != null && IsRemoveRowColumn(e.ColumnIndex))
 			{
 				RemoveRowAction(e.RowIndex);
 				if (VirtualMode)