MERGE.

1 files changed, 16 insertions, 1 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index 213d1a83d..7ef47fabd 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -10,6 +10,7 @@ using Tango.Core.Commands;
 using Tango.MachineStudio.Common;
 using Tango.MachineStudio.Common.Authentication;
 using Tango.MachineStudio.Common.Modules;
+using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.UI.SupervisingController;
 using Tango.SharedUI;
 
@@ -52,10 +53,24 @@ namespace Tango.MachineStudio.UI.ViewModels
             set { _studioModuleLoader = value; RaisePropertyChangedAuto(); }
         }
 
-        public MainViewVM(IMainView view, IAuthenticationProvider authenticationProvider, IStudioModuleLoader studioModuleLoader) : base(view)
+        private INotificationProvider _notificationProvider;
+
+        public INotificationProvider NotificationProvider
+        {
+            get { return _notificationProvider; }
+            set { _notificationProvider = value; RaisePropertyChangedAuto(); }
+        }
+
+
+        public MainViewVM(
+            IMainView view,
+            IAuthenticationProvider authenticationProvider,
+            IStudioModuleLoader studioModuleLoader,
+            INotificationProvider notificationProvider) : base(view)
         {
             AuthenticationProvider = authenticationProvider;
             StudioModuleLoader = studioModuleLoader;
+            NotificationProvider = notificationProvider;
 
             StartModuleCommand = new RelayCommand<IStudioModule>(StartModule);