From 3f1747b1fb915358414da70659b82cecb0314be2 Mon Sep 17 00:00:00 2001
From: "Darryl L. Miles" <darryl.miles@darrylmiles.org>
Date: Tue, 21 Jul 2026 19:33:16 +0100
Subject: [PATCH] crosshair: prevent crash from command usage in headless mode

---
 commands/CmdCD.c  | 3 ++-
 dbwind/DBWtools.c | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/commands/CmdCD.c b/commands/CmdCD.c
index c9315378..38ed2547 100644
--- a/commands/CmdCD.c
+++ b/commands/CmdCD.c
@@ -3819,7 +3819,8 @@ CmdCrosshair(
 	TxError("Usage: %s off|x y \n", cmd->tx_argv[0]);
 	return;
     }
-    DBWSetCrosshair(w, &pos);
+    if (w)
+	DBWSetCrosshair(w, &pos);
 }
 
 
diff --git a/dbwind/DBWtools.c b/dbwind/DBWtools.c
index 73809b4f..0666cf13 100644
--- a/dbwind/DBWtools.c
+++ b/dbwind/DBWtools.c
@@ -558,6 +558,9 @@ DBWSetCrosshair(window, pos)
     MagWindow *window;
     Point *pos;			/* New crosshair location in coords of rootDef. */
 {
+    assert(window);
+    assert(pos);
+
     bool needUpdate = FALSE;
 
     if (WINDOW_DEF(window) != curCrosshair.def) needUpdate = TRUE;