Merge branch 'develop'

espositos · Aug 5, 2020 · 621b1ec · 621b1ec
2 parents 80cce99 + 735b047
commit 621b1ec
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/chatlink.js b/chatlink.js
@@ -79,7 +79,7 @@ export class ChatLink {
     static getToken(speakerData) {
         let token = game.actors.tokens[speakerData.idToken]?.token;
         if(!token)
-            token = canvas.tokens.placeables.find(t => t.actor._id === speakerData.idActor);
+            token = canvas.tokens.placeables.find(t => t.actor?._id === speakerData.idActor);
 
         return token;
     }
@@ -120,13 +120,13 @@ export class ChatLink {
     }
 
     static doSelectToken(event, user, token) {
+        let ctrlKey = event.ctrlKey;
         if (!ChatLink.permissionToControl(user, token)) {      
-            ChatLink.targetToken(event, user, token);
+            ChatLink.targetToken(event, user, token, ctrlKey);
             return;
         }
 
         let shiftKey = event.shiftKey;
-        let ctrlKey = event.ctrlKey;
 
         if (shiftKey) {
             ChatLink.targetToken(event, user, token, ctrlKey);