From 360b25019a47bea98e50539c0cf341f4b0e19226 Mon Sep 17 00:00:00 2001
From: Sam Hill <soshjam@soshjam.com>
Date: Fri, 23 Jul 2021 16:30:45 -0600
Subject: [PATCH] Temp fix to stop torpedo core from crashing

---
 src/components/views/TorpedoLoading/core.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/TorpedoLoading/core.js b/src/components/views/TorpedoLoading/core.js
index 34c383b37..9484bed8d 100644
--- 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>