From 7e27a8663e61b7c7fa89ce3a65b83447b2803b0a Mon Sep 17 00:00:00 2001
From: sfop <sfop@sf-cons-02.psi.ch>
Date: Fri, 13 Jan 2017 14:56:12 +0100
Subject: [PATCH] Closedown

---
 devices/CurrentCamera.properties |  2 +-
 plugins/ScreenPanel.java         | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties
index 5a44361..bfd2855 100644
--- a/devices/CurrentCamera.properties
+++ b/devices/CurrentCamera.properties
@@ -1,4 +1,4 @@
-#Fri Jan 13 14:44:05 CET 2017
+#Fri Jan 13 14:56:08 CET 2017
 colormap=Temperature
 colormapAutomatic=true
 colormapMax=0.0
diff --git a/plugins/ScreenPanel.java b/plugins/ScreenPanel.java
index c822d7f..2cf222a 100644
--- a/plugins/ScreenPanel.java
+++ b/plugins/ScreenPanel.java
@@ -2015,20 +2015,21 @@ public class ScreenPanel extends Panel {
             if (!comboCameras.isEnabled()) {
                 throw new Exception("Invalid state");
             }
-            comboCameras.setEnabled(false);
-            buttonCamtool.setEnabled(false);
-            buttonDirect.setEnabled(false);
+            //comboCameras.setEnabled(false);
+            //buttonCamtool.setEnabled(false);
+            //buttonDirect.setEnabled(false);
+            final String cameraName = (String) comboCameras.getSelectedItem();
             new Thread(new Runnable() {
                 @Override
                 public void run() {
                     try {
-                        setCamera((String) comboCameras.getSelectedItem());
+                        setCamera(cameraName);
                     } catch (Exception ex) {
                         ex.printStackTrace();
                     } finally {
-                        comboCameras.setEnabled(true);
-                        buttonCamtool.setEnabled(true);
-                        buttonDirect.setEnabled(true);
+                        //comboCameras.setEnabled(true);
+                        //buttonCamtool.setEnabled(true);
+                        //buttonDirect.setEnabled(true);
                     }
                 }
             }).start();