From be33ee418fd6f83acc849e98db9c14ad94538422 Mon Sep 17 00:00:00 2001
From: boccioli_m <boccioli_m@PC11577.psi.ch>
Date: Fri, 12 Jun 2015 12:05:27 +0200
Subject: [PATCH] Closedown

---
 plugins/TestingList.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/TestingList.java b/plugins/TestingList.java
index 838ed3f..28158ff 100644
--- a/plugins/TestingList.java
+++ b/plugins/TestingList.java
@@ -413,8 +413,8 @@ public class TestingList extends Panel {
                 }
             }
             catch (Exception ex) {
-                SwingUtils.showMessage(this, "getTestInProgress()", ex.toString());
                 this.setButtonToStop();
+                SwingUtils.showMessage(this, "getTestInProgress()", ex.toString());
             }
             finally{
                 return dsTestProperties;
@@ -489,7 +489,10 @@ public class TestingList extends Panel {
                         args.put("status", false);                        
                         run(sTestName, args);
                     } catch (Exception ex) {
-                        SwingUtils.showMessage(this, "getTestInProgress()", ex.toString());
+                        SwingUtils.showMessage(this, "executeTest()", ex.toString());
+                        logger.log(Level.SEVERE, ex.toString());
+                        showResult(sDeviceName, sTestName, ex.toString(), "Failure");
+                        setButtonToStop();
                     }
                 } 
             }