Prevents WordBackward or WordForward throw null exception. (gui-cs#2529)

BDisp · Apr 14, 2023 · 9aaf84f · 9aaf84f
1 parent 5ae8e98
commit 9aaf84f
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/Terminal.Gui/Views/TextField.cs b/Terminal.Gui/Views/TextField.cs
@@ -1058,13 +1058,15 @@ public override bool MouseEvent (MouseEvent ev)
 					|| (x > 0 && (char)text [x] == ' ')) {
 
 					var newPosBw = GetModel ().WordBackward (x, 0);
+					if (newPosBw == null) return true;
 					sbw = newPosBw.Value.col;
 				}
 				if (sbw != -1) {
 					x = sbw;
 					PositionCursor (x);
 				}
 				var newPosFw = GetModel ().WordForward (x, 0);
+				if (newPosFw == null) return true;
 				ClearAllSelection ();
 				if (newPosFw.Value.col != -1 && sbw != -1) {
 					point = newPosFw.Value.col;