From 64c0b9c241c64754c7ac69d9886ddcdf97fe7331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20=27Morty=27=20Str=C3=BCbe?= Date: Tue, 30 Oct 2012 11:42:01 +0100 Subject: [PATCH] Cooja: Fix command line override of ContikiPath Without the fix the command line parameter was overwritten by the simulation configuration. --- tools/cooja/java/se/sics/cooja/GUI.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tools/cooja/java/se/sics/cooja/GUI.java b/tools/cooja/java/se/sics/cooja/GUI.java index a0e7a7826..12c0d4bab 100644 --- a/tools/cooja/java/se/sics/cooja/GUI.java +++ b/tools/cooja/java/se/sics/cooja/GUI.java @@ -2790,11 +2790,7 @@ public class GUI extends Observable { * New value */ public static void setExternalToolsSetting(String name, String newVal) { - if (specifiedContikiPath != null && "PATH_CONTIKI".equals(name)) { - specifiedContikiPath = newVal; - } else { - currentExternalToolsSettings.setProperty(name, newVal); - } + currentExternalToolsSettings.setProperty(name, newVal); } /**