plugins/remote-actions-extra/TakeControlMonitor: Prevent null pointer…

… if no no entity name translation is known.
LSTS · Nov 16, 2023 · 1d30b1f · 1d30b1f
1 parent 0a91fc0
commit 1d30b1f
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/...-actions-extra/src/java/pt/lsts/neptus/plugins/remoteactionsextra/TakeControlMonitor.java b/...-actions-extra/src/java/pt/lsts/neptus/plugins/remoteactionsextra/TakeControlMonitor.java
@@ -34,6 +34,7 @@
 
 import pt.lsts.imc.EntityState;
 import pt.lsts.imc.VehicleState;
+import pt.lsts.neptus.NeptusLog;
 import pt.lsts.neptus.console.events.ConsoleEventMainSystemChange;
 
 import javax.swing.JButton;
@@ -92,8 +93,13 @@ public void on(ConsoleEventMainSystemChange evt) {
     }
 
     public void on(EntityState msg) {
-        if (!msg.getSourceName().equals(parent.getMainVehicleId())
-                || !msg.getEntityName().equals(entityName)) {
+        try {
+            if (!msg.getSourceName().equals(parent.getMainVehicleId())
+                    || !msg.getEntityName().equals(entityName)) {
+                return;
+            }
+        } catch (Exception e) {
+            NeptusLog.pub().warn(e.getMessage());
             return;
         }