MERGE.

1 files changed, 15 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Views/MainView.xaml.cs
index 65e50905d..31d50dedb 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Views/MainView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Views/MainView.xaml.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@@ -27,5 +28,19 @@ namespace Tango.MachineStudio.Synchronization.Views
             InitializeComponent();
             Instance = this;
         }
+
+        private void txtLog_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            Task.Factory.StartNew(() =>
+            {
+                Thread.Sleep(50);
+
+                this.Dispatcher.Invoke(() =>
+                {
+                    txtLog.SelectionStart = txtLog.Text.Length;
+                    txtLog.ScrollToEnd();
+                });
+            });
+        }
     }
 }