From 2d23a5e6da6c20cb29deda59bac8fa032c7568e3 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 29 Mar 2017 18:48:01 +0000 Subject: [PATCH] B2017-066 fixed an index out of range when doing a right arrow to walk through table cells where the first column of the table had merged rows --- PROMS/Volian.Controls.Library/VlnFlexGrid.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PROMS/Volian.Controls.Library/VlnFlexGrid.cs b/PROMS/Volian.Controls.Library/VlnFlexGrid.cs index 6d18f70a..6758abdb 100644 --- a/PROMS/Volian.Controls.Library/VlnFlexGrid.cs +++ b/PROMS/Volian.Controls.Library/VlnFlexGrid.cs @@ -4709,7 +4709,7 @@ namespace Volian.Controls.Library CellRange crDest = _owner.GetMergedRange(cr.r2 + 1, 0); if (cr.r2 < crDest.r1) // It will move to the correct place _owner.Select(crDest); - else if (crDest.r2 < _owner.Rows.Count) + else if (crDest.r2 < _owner.Rows.Count -1) //B2017066 check against count -1 to avoid index out of range error _owner.Select(_owner.GetMergedRange(crDest.r2 + 1, 0)); else _owner.OnCursorMovement(this, new VlnFlexGridCursorMovementEventArgs(args.Key));