diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-04-12 12:47:19 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-04-12 12:47:19 +0300 |
| commit | 9c0bad738d47742f39f2b02b240591653da6bc12 (patch) | |
| tree | b3cb5e2d15927f4b04d971998b156a8673863d4e /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls | |
| parent | 8926f5b786ba07b3c21a1ada6ed9939a41e247d5 (diff) | |
| download | Tango-9c0bad738d47742f39f2b02b240591653da6bc12.tar.gz Tango-9c0bad738d47742f39f2b02b240591653da6bc12.zip | |
Added changes to PMR hardware.
Implemented Start Job and Record.
Fixed issue with logs timeline event width.
Implemented 'Event Resolved' event to event logs.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveColorPickerControl.xaml.cs | 5 |
1 files changed, 4 insertions, 1 deletions
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() |