Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 10 insertions, 7 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Console/ConsoleWindowVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Console/ConsoleWindowVM.cs
index 10b05bc64..777c488d7 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Console/ConsoleWindowVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Console/ConsoleWindowVM.cs
@@ -24,6 +24,7 @@ namespace Tango.MachineStudio.UI.Console
         private INotificationProvider _notificatrion;
         private TextBox _txtLog;
         private String _currentFile;
+        private ScriptEngine _engine;
 
 
         /// <summary>
@@ -160,22 +161,24 @@ namespace Tango.MachineStudio.UI.Console
 
         private void Stop()
         {
-
+            if (_engine != null)
+            {
+                _engine.Stop();
+            }
         }
 
         private async void Run()
         {
-            ScriptEngine engine = new ScriptEngine(new ConsoleOnExecuteParameters(new ConsoleManager(WriteLine)));
-            engine.Stop();
-            engine.ReferencedAssemblies.Add(this.GetType());
-            engine.ReferencedAssemblies.Add(typeof(INotificationProvider));
+            _engine = new ScriptEngine(new ConsoleOnExecuteParameters(new ConsoleManager(WriteLine)));
+            _engine.ReferencedAssemblies.Add(this.GetType());
+            _engine.ReferencedAssemblies.Add(typeof(INotificationProvider));
 
             foreach (var module in _moduleLoader.AllModules)
             {
-                engine.ReferencedAssemblies.Add(module.GetType());
+                _engine.ReferencedAssemblies.Add(module.GetType());
             }
 
-            await engine.Run(Code, null);
+            await _engine.Run(Code, null);
         }
 
         private void WriteLine(String text)