Merge pull request #3192 from SoshJam/temp-fix-torpedo-crash

Temporary fix to stop the Torpedo Core from crashing
Thorium-Sim · Jul 27, 2021 · ec9d0ea · ec9d0ea
2 parents 40ef572 + 360b250
commit ec9d0ea
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>