From 31cdbbb8ddb8038842ebbdea7dcc8660ac7c313a Mon Sep 17 00:00:00 2001
From: Mitchell McCaffrey <mitchemmc@gmail.com>
Date: Sun, 31 May 2020 10:23:45 +1000
Subject: [PATCH] Fix bug with deleteing tokens that have been removed

---
 src/components/map/MapToken.js           | 4 ++--
 src/components/token/TokenDragOverlay.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/map/MapToken.js b/src/components/map/MapToken.js
index 9f67bba..f55dd4e 100644
--- a/src/components/map/MapToken.js
+++ b/src/components/map/MapToken.js
@@ -48,7 +48,7 @@ function MapToken({
     const tokenImage = event.target;
     const tokenImageRect = tokenImage.getClientRect();
 
-    if (token.isVehicle) {
+    if (token && token.isVehicle) {
       // Find all other tokens on the map
       const layer = tokenImage.getLayer();
       const tokens = layer.find(".token");
@@ -83,7 +83,7 @@ function MapToken({
     const tokenImage = event.target;
 
     const mountChanges = {};
-    if (token.isVehicle) {
+    if (token && token.isVehicle) {
       const layer = tokenImage.getLayer();
       const mountedTokens = tokenImage.find(".token");
       for (let mountedToken of mountedTokens) {
diff --git a/src/components/token/TokenDragOverlay.js b/src/components/token/TokenDragOverlay.js
index 70097bc..cb32009 100644
--- a/src/components/token/TokenDragOverlay.js
+++ b/src/components/token/TokenDragOverlay.js
@@ -66,7 +66,7 @@ function TokenDragOverlay({
     function handleTokenDragEnd() {
       if (isRemoveHovered) {
         // Handle other tokens when a vehicle gets deleted
-        if (token.isVehicle) {
+        if (token && token.isVehicle) {
           const layer = tokenImage.getLayer();
           const mountedTokens = tokenImage.find(".token");
           for (let mountedToken of mountedTokens) {