1 files changed, 19 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/DirectSynchronizationViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/DirectSynchronizationViewVM.cs
index d7dac7fbe..070beefa6 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/DirectSynchronizationViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/DirectSynchronizationViewVM.cs
@@ -1,4 +1,5 @@
 using Google.Protobuf;
+using Microsoft.Practices.ServiceLocation;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -35,6 +36,7 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
         private LocalDBComparer _comparer;
         private INotificationProvider _notification;
         private String _comparedSerialNumber;
+        private MainViewVM _mainView;
 
         #region Constructors
 
@@ -160,6 +162,21 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
 
         #endregion
 
+        #region Event Handlers
+
+        private void Comparer_Progress(object sender, string e)
+        {
+            if (_mainView == null)
+            {
+                _mainView = ServiceLocator.Current.GetInstance<MainViewVM>();
+                _mainView.Log = String.Empty;
+            }
+
+            _mainView.Log += ("[" + DateTime.Now.ToTimeString() + "]  " + e + Environment.NewLine);
+        }
+
+        #endregion
+
         #region Private Methods
 
         /// <summary>
@@ -212,6 +229,7 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
                             using (_notification.PushTaskItem("Comparing database..."))
                             {
                                 _comparer = new LocalDBComparer(new SQLiteDataBase(_masterDBFile), new SQLiteDataBase(_slaveDBFile));
+                                _comparer.Progress += Comparer_Progress;
 
                                 var diffs = _comparer.Compare();
                                 Differences = new ObservableCollection<Diff>(diffs);
@@ -253,6 +271,7 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
             });
         }
 
+
         /// <summary>
         /// Synchronizes the selected machine with the remote database.
         /// </summary>