Changeset 11834 for trunk

Timestamp:

01/27/15 18:21:36 (10 years ago)

Author:

jkarder

Message:

#2077: set scriptThread to null when the script completes execution

Location:

trunk/sources

Files:

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

trunk/sources/HeuristicLab.Scripting.Views/3.3/CSharpScriptView.cs

@@ -111 +111 @@
         if (Compile()) {
           outputTextBox.Clear();
+          Running = true;
           Content.ExecuteAsync();
-          Running = true;
         }
     }

trunk/sources/HeuristicLab.Scripting/3.3/Scripts/CSharp/CSharpScript.cs

@@ -107 +107 @@
           ex = e;
         } finally {
+          scriptThread = null;
           OnScriptExecutionFinished(ex);
         }
@@ -115 +116 @@
 
     public virtual void Kill() {
-      if (scriptThread.IsAlive)
-        scriptThread.Abort();
+      if (scriptThread == null) return;
+      scriptThread.Abort();
     }