Fix waypoint disappearing after each save

1 files changed, 12 insertions, 0 deletions

diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp
index e0203355..cccf1d2e 100644
--- a/src/core/Radar.cpp
+++ b/src/core/Radar.cpp
@@ -1022,6 +1022,10 @@ const char* gRadarTexNames[] = {
 void
 CRadar::Initialise()
 {
+#ifdef MENU_MAP
+	TargetMarkerId = -1;
+#endif
+
 	for (int i = 0; i < NUMRADARBLIPS; i++) {
 		ms_RadarTrace[i].m_BlipIndex = 1;
 		SetRadarMarkerState(i, false);
@@ -1107,15 +1111,23 @@ INITSAVEBUF
 	WriteSaveHeader(buf, 'R', 'D', 'R', '\0', *size - SAVE_HEADER_SIZE);
 
 #ifdef MENU_MAP
+	bool bWaypointDeleted = false;
 	if (TargetMarkerId != -1) {
 		ClearBlip(TargetMarkerId);
 		TargetMarkerId = -1;
+		bWaypointDeleted = true;
 	}
 #endif
 
 	for (int i = 0; i < NUMRADARBLIPS; i++)
 		WriteSaveBuf(buf, ms_RadarTrace[i]);
 
+	
+#ifdef MENU_MAP
+	if(bWaypointDeleted)
+		ToggleTargetMarker(TargetMarkerPos.x, TargetMarkerPos.y);
+#endif
+
 VALIDATESAVEBUF(*size);
 }