1 files changed, 11 insertions, 3 deletions

diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/ViewModels/MainViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/ViewModels/MainViewVM.cs
index 97c55aba2..fa6898937 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/ViewModels/MainViewVM.cs
@@ -13,10 +13,13 @@ namespace Tango.FSE.PPCConsole.ViewModels
 {
     public class MainViewVM : FSEViewModel
     {
+        private List<ConsoleSuggestion> _lastSuggestions;
+
         public ConsoleControlVM ConsoleVM { get; set; }
 
         public MainViewVM()
         {
+            _lastSuggestions = new List<ConsoleSuggestion>();
             ConsoleVM = new ConsoleControlVM();
             ConsoleVM.CommandExecuting += ConsoleVM_CommandExecuting;
             ConsoleVM.Clear();
@@ -24,7 +27,6 @@ namespace Tango.FSE.PPCConsole.ViewModels
 
         private async void ConsoleVM_CommandExecuting(object sender, ConsoleCommandExecutingEventArgs e)
         {
-            await Task.Delay(1000);
             try
             {
                 var result = await MachineProvider.MachineOperator.SendGenericRequest<ConsoleCommandDTO, ConsoleCommandExecutionResult>(new ConsoleCommandDTO()
@@ -32,11 +34,17 @@ namespace Tango.FSE.PPCConsole.ViewModels
                     Command = e.Command.CommandText,
                     WorkingFolder = e.Command.WorkingFolder,
                 });
-                e.Complete(result.Output, result.WorkingFolder);
+                _lastSuggestions = result.Suggestions;
+                e.Complete(result);
             }
             catch (Exception ex)
             {
-                e.Complete(ex.FlattenMessage(), e.Command.WorkingFolder);
+                e.Complete(new ConsoleCommandExecutionResult()
+                {
+                    Output = ex.FlattenMessage(),
+                    WorkingFolder = e.Command.WorkingFolder,
+                    Suggestions = _lastSuggestions
+                });
             }
         }