diff -r f0215b6c526e -r ad8e8a65f6a2 src/waypoint.cpp
--- a/src/waypoint.cpp	Mon Sep 15 18:50:48 2008 +0000
+++ b/src/waypoint.cpp	Mon Sep 15 19:02:50 2008 +0000
@@ -386,26 +386,24 @@
 	Waypoint *wp = GetWaypoint(p1);
 	if (!CheckOwnership(wp->owner)) return CMD_ERROR;
 
-	if (!StrEmpty(_cmd_text)) {
+	bool reset = StrEmpty(_cmd_text);
+
+	if (!reset) {
 		if (strlen(_cmd_text) >= MAX_LENGTH_WAYPOINT_NAME_BYTES) return CMD_ERROR;
 		if (!IsUniqueWaypointName(_cmd_text)) return_cmd_error(STR_NAME_MUST_BE_UNIQUE);
-
-		if (flags & DC_EXEC) {
-			free(wp->name);
-			wp->name = strdup(_cmd_text);
-			wp->town_cn = 0;
+	}
 
-			UpdateWaypointSign(wp);
-			MarkWholeScreenDirty();
+	if (flags & DC_EXEC) {
+		free(wp->name);
+
+		if (reset) {
+			MakeDefaultWaypointName(wp); // sets wp->name = NULL
+		} else {
+			wp->name = strdup(_cmd_text);
 		}
-	} else {
-		if (flags & DC_EXEC) {
-			free(wp->name);
 
-			MakeDefaultWaypointName(wp);
-			UpdateWaypointSign(wp);
-			MarkWholeScreenDirty();
-		}
+		UpdateWaypointSign(wp);
+		MarkWholeScreenDirty();
 	}
 	return CommandCost();
 }