Changeset 11937 for stable/HeuristicLab.Scripting/3.3/Scripts/CSharp

Timestamp:

02/06/15 12:44:09 (10 years ago)

Author:

jkarder

Message:

#2077: merged r11807:11811, r11816, r11819, r11822, r11825, r11834, r11835, r11836, r11933 and r11936 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Scripting/3.3/Scripts/CSharp/CSharpScript.cs (modified) (2 diffs)

stable/HeuristicLab.Scripting/3.3/Scripts/CSharp/CSharpScript.cs

@@ -102 +102 @@
           OnScriptExecutionStarted();
           compiledScript.Execute(VariableStore);
-        } catch (ThreadAbortException) {
-          // the execution was cancelled by the user
         } catch (Exception e) {
           ex = e;
         } finally {
+          scriptThread = null;
           OnScriptExecutionFinished(ex);
         }
@@ -115 +114 @@
 
     public virtual void Kill() {
-      if (scriptThread.IsAlive)
-        scriptThread.Abort();
+      if (scriptThread == null) return;
+      scriptThread.Abort();
     }