diff --git a/App/Modules/SicModules/Config/TM/DeviceModelSystem.xml b/App/Modules/SicModules/Config/TM/DeviceModelSystem.xml index 092aa09..7d66dbb 100644 --- a/App/Modules/SicModules/Config/TM/DeviceModelSystem.xml +++ b/App/Modules/SicModules/Config/TM/DeviceModelSystem.xml @@ -137,7 +137,6 @@ - diff --git a/App/Modules/SicModules/UnLoads/UnLoadModule.cs b/App/Modules/SicModules/UnLoads/UnLoadModule.cs index 98c8b2a..0ccadd5 100644 --- a/App/Modules/SicModules/UnLoads/UnLoadModule.cs +++ b/App/Modules/SicModules/UnLoads/UnLoadModule.cs @@ -345,21 +345,22 @@ namespace SicModules.UnLoads });*/ DATA.Subscribe($"{Name}.UnderVAC", () => { - if (_unLoadDevice.CheckVacuum()) + if(_unLoadDevice != null) { - return true; + return _unLoadDevice.CheckVacuum(); } + return false; }); DATA.Subscribe($"{Name}.LidState", () => { - if (_unLoadDevice.CheckLidClose()) + if(_unLoadDevice != null) { - return "Closed"; + return _unLoadDevice.CheckLidClose() ? "Closed" : "Open"; } - return "Open"; + return "Closed"; }); } diff --git a/App/SicUI/MainViewModel.cs b/App/SicUI/MainViewModel.cs index 4cfb734..73a9e78 100644 --- a/App/SicUI/MainViewModel.cs +++ b/App/SicUI/MainViewModel.cs @@ -1374,15 +1374,20 @@ namespace SicUI.Client if (menuInfo.System is "PM1" or "PM2") { var rect = FindVisualChildByName(container, "InnerBG"); - rect.Fill = menuInfo.Selected + if(rect != null) + { + rect.Fill = menuInfo.Selected ? BgActiveContent : new SolidColorBrush((Color)ColorConverter.ConvertFromString("#FF346294")); + } var bgBorder = FindVisualChildByName(container, "BG"); - bgBorder.Background = menuInfo.Selected - ? BgActiveContent - : new SolidColorBrush((Color)ColorConverter.ConvertFromString("#FF346294")); - + if (bgBorder != null) + { + bgBorder.Background = menuInfo.Selected + ? BgActiveContent + : new SolidColorBrush((Color)ColorConverter.ConvertFromString("#FF346294")); + } } } }