From 67e6862dcaad0b90e890e2825da592ba9a71b20b Mon Sep 17 00:00:00 2001
From: voulot_d <voulot_d@sf-lc6a-64.psi.ch>
Date: Fri, 13 Jan 2017 15:53:31 +0100
Subject: [PATCH] Startup

---
 devices/CurrentCamera.properties | 2 +-
 plugins/ScreenPanel.java         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties
index 30eef5e..05be5cb 100644
--- a/devices/CurrentCamera.properties
+++ b/devices/CurrentCamera.properties
@@ -1,4 +1,4 @@
-#Fri Jan 13 15:51:11 CET 2017
+#Fri Jan 13 15:53:19 CET 2017
 colormap=Temperature
 colormapAutomatic=true
 colormapMax=0.0
diff --git a/plugins/ScreenPanel.java b/plugins/ScreenPanel.java
index 2dba96a..471e61e 100644
--- a/plugins/ScreenPanel.java
+++ b/plugins/ScreenPanel.java
@@ -695,8 +695,8 @@ public class ScreenPanel extends Panel {
             onTimer();
         }                
         
-        tcomboScreen.join();
-        tcomboFilter.join();
+        //tcomboScreen.join();
+        //tcomboFilter.join();
 
     }