From 9c0bad738d47742f39f2b02b240591653da6bc12 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 12 Apr 2018 12:47:19 +0300 Subject: Added changes to PMR hardware. Implemented Start Job and Record. Fixed issue with logs timeline event width. Implemented 'Event Resolved' event to event logs. --- .../Controls/HiveColorPickerControl.xaml.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls') diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveColorPickerControl.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveColorPickerControl.xaml.cs index 41b362889..b8ebe9f6a 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveColorPickerControl.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveColorPickerControl.xaml.cs @@ -93,7 +93,10 @@ namespace Tango.MachineStudio.Common.Controls private void HiveCombo_HiveGenerated(object sender, EventArgs e) { - hiveCombo.GenerateDemoModeHiveColors(SelectedColor.Value); + if (SelectedColor.HasValue) + { + hiveCombo.GenerateDemoModeHiveColors(SelectedColor.Value); + } } private void OnSelectedHiveColorChanged() -- cgit v1.3.1