aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModelLocator.cs
diff options
context:
space:
mode:
authorAvi Levkovich <avi@twine-s.com>2018-04-09 14:25:30 +0300
committerAvi Levkovich <avi@twine-s.com>2018-04-09 14:25:30 +0300
commite8e2f174cc7dc1e6c183e855834982d12e92833c (patch)
treeea8c5358d7e6928c513814c8619339f0c6790840 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModelLocator.cs
parentf19e2e305d8baeafc30dde4fc0aa3fa37038869c (diff)
parentc1ed75027f069e204e52e48bfb610d2d225bbd72 (diff)
downloadTango-e8e2f174cc7dc1e6c183e855834982d12e92833c.tar.gz
Tango-e8e2f174cc7dc1e6c183e855834982d12e92833c.zip
mERGE
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModelLocator.cs')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModelLocator.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModelLocator.cs
index 76c89000d..ef6923e27 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModelLocator.cs
@@ -1,6 +1,7 @@
using GalaSoft.MvvmLight;
using GalaSoft.MvvmLight.Ioc;
using Microsoft.Practices.ServiceLocation;
+using Tango.MachineStudio.Logging.Navigation;
using Tango.MachineStudio.Logging.ViewModels;
namespace Tango.MachineStudio.Logging
@@ -18,6 +19,9 @@ namespace Tango.MachineStudio.Logging
{
ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default);
SimpleIoc.Default.Register<MainViewVM>();
+
+ SimpleIoc.Default.Unregister<LoggingNavigationManager>();
+ SimpleIoc.Default.Register<LoggingNavigationManager>(() => new LoggingNavigationManager());
}
public static MainViewVM MainViewVM