From a8487fa0f38ad31d609476511a3d0baeed9ed429 Mon Sep 17 00:00:00 2001
From: doom <ghostrecon5123@gmail.com>
Date: Tue, 26 Sep 2023 13:22:00 -0700
Subject: [PATCH] ...

---
 code/controllers/subsystem/minimap.dm         |  5 ++++-
 tgui/packages/tgui/interfaces/TacticalMap.tsx | 22 +++++++++----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/code/controllers/subsystem/minimap.dm b/code/controllers/subsystem/minimap.dm
index c385cb9f26db..491bd89810ee 100644
--- a/code/controllers/subsystem/minimap.dm
+++ b/code/controllers/subsystem/minimap.dm
@@ -541,6 +541,9 @@ SUBSYSTEM_DEF(minimaps)
 
 	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
+		current_map = get_current_map(user)
+		if(!current_map)
+			distribute_current_map_png(user)
 
 		user.client.register_map_obj(map_holder.map)
 		ui = new(user, src, "TacticalMap")
@@ -603,7 +606,7 @@ SUBSYSTEM_DEF(minimaps)
 		if ("menuSelect")
 			if(params["selection"] == "new canvas")
 				distribute_current_map_png(user)
-				current_map = get_current_map(user)
+
 			. = TRUE
 
 		if ("updateCanvas")
diff --git a/tgui/packages/tgui/interfaces/TacticalMap.tsx b/tgui/packages/tgui/interfaces/TacticalMap.tsx
index 93b73be75087..4ca48bc0a034 100644
--- a/tgui/packages/tgui/interfaces/TacticalMap.tsx
+++ b/tgui/packages/tgui/interfaces/TacticalMap.tsx
@@ -98,7 +98,7 @@ export const TacticalMap = (props, context) => {
   };
 
   return (
-    <Window width={650} height={850} theme={data.isXeno ? "xeno" : "crtblue"}>
+    <Window width={650} height={850} theme={data.isXeno ? 'xeno' : 'crtblue'}>
       <Window.Content>
         <Section
           fontSize="20px"
@@ -115,7 +115,7 @@ export const TacticalMap = (props, context) => {
                   return (
                     <Tabs.Tab
                       key={i}
-                      color={data.isXeno ? "purple" : "blue"}
+                      color={data.isXeno ? 'purple' : 'blue'}
                       selected={i === pageIndex}
                       icon={page.icon}
                       onClick={() => handleTacmapOnClick(i, page.title)}>
@@ -137,15 +137,15 @@ const ViewMapPanel = (props, context) => {
   const { data } = useBackend<TacMapProps>(context);
   return (
     <Section fill>
-      {data.canViewHome === 1 &&
-      <ByondUi
-        params={{
-          id: data.mapRef,
-          type: 'map',
-        }}
-        class="TacticalMap"
-      />
-      }
+      {data.canViewHome === 1 && (
+        <ByondUi
+          params={{
+            id: data.mapRef,
+            type: 'map',
+          }}
+          class="TacticalMap"
+        />
+      )}
     </Section>
   );
 };