Merge branch 'develop' of github.com:Thorium-Sim/thorium into develop

Thorium-Sim · Sep 21, 2021 · 37988ef · 37988ef
2 parents e79a13c + ec9d0ea
commit 37988ef
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/components/views/TorpedoLoading/core.js b/src/components/views/TorpedoLoading/core.js
@@ -32,7 +32,7 @@ const TorpedoView = ({torpedo}) => {
           if (torpedo.state === "idle") return "No Torpedos Loaded";
 
           return `${capitalCase(
-            loaded ? loaded.type : lastLoaded && lastLoaded.type,
+            loaded ? loaded.type : (lastLoaded ? lastLoaded.type : ""),
           )} Torpedo ${torpedo.state === "loaded" ? "Loaded" : "Fired"}`;
         })()}
       </OutputField>