Fix crash in MapUI.MouseMove when a cursor action deactivates itself on LeftDown

Rampastring · Rampastring · commit 4f198dcf563e · 2026-06-22T23:03:24.000+03:00
diff --git a/src/TSMapEditor/UI/MapUI.cs b/src/TSMapEditor/UI/MapUI.cs
@@ -496,7 +496,9 @@ public override void OnMouseMove()
                     }
                 }
 
-                CursorAction.MouseMove(tileUnderCursor == null ? Point2D.NegativeOne : tileUnderCursor.CoordsToPoint());
+                // Re-check for null in case the cursor action exited itself on LeftDown
+                if (CursorAction != null)
+                    CursorAction.MouseMove(tileUnderCursor == null ? Point2D.NegativeOne : tileUnderCursor.CoordsToPoint());
             }
 
             // Right-click scrolling

Original file line number	Diff line number	Diff line change
`@@ -496,7 +496,9 @@ public override void OnMouseMove()`
`496`	`496`	`}`
`497`	`497`	`}`
`498`	`498`
`499`		`- CursorAction.MouseMove(tileUnderCursor == null ? Point2D.NegativeOne : tileUnderCursor.CoordsToPoint());`
	`499`	`+ // Re-check for null in case the cursor action exited itself on LeftDown`
	`500`	`+ if (CursorAction != null)`
	`501`	`+ CursorAction.MouseMove(tileUnderCursor == null ? Point2D.NegativeOne : tileUnderCursor.CoordsToPoint());`
`500`	`502`	`}`
`501`	`503`
`502`	`504`	`// Right-click scrolling`