From 858a2b114f78c87883510e3627874c7632f81177 Mon Sep 17 00:00:00 2001 From: Roy Date: Sun, 18 Feb 2018 09:23:15 +0200 Subject: Developer redesign.. --- .../Modules/Tango.MachineStudio.DB/ViewModels/MainViewVM.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MainViewVM.cs') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MainViewVM.cs index 2835ef102..27c4bc7a0 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MainViewVM.cs @@ -25,9 +25,15 @@ namespace Tango.MachineStudio.DB.ViewModels if (module is DBModule && args != null && args is IObservableEntity) { String vmName = args.GetType().Name + "sViewVM"; - + Type vmType = Assembly.GetAssembly(typeof(MainViewVM)).GetTypes().SingleOrDefault(x => x.Name == vmName); + if (vmType == null) + { + vmName = args.GetType().BaseType.Name + "sViewVM"; + vmType = Assembly.GetAssembly(typeof(MainViewVM)).GetTypes().SingleOrDefault(x => x.Name == vmName); + } + if (vmType != null) { var vm = ServiceLocator.Current.GetInstance(vmType); -- cgit v1.3.1