diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-03-25 14:57:56 +0200 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-03-25 14:57:56 +0200 |
| commit | 8f57d4962fa84499c8a153ebfff6e7766434ee1c (patch) | |
| tree | f8c66256019cbd8d88816da88db6151530654aaf /Software/Visual_Studio | |
| parent | 9f2461055ef42054026aab2da4e0363e57b67f2a (diff) | |
| download | Tango-8f57d4962fa84499c8a153ebfff6e7766434ee1c.tar.gz Tango-8f57d4962fa84499c8a153ebfff6e7766434ee1c.zip | |
Machine Studio. Added bottom margin to the job outline to show the "BACK TO JOBS" button.
Related Work Items: #2607
Diffstat (limited to 'Software/Visual_Studio')
2 files changed, 2 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml index e7f16146b..0400ee7e6 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml @@ -208,7 +208,7 @@ </Grid> </Grid> - <Grid HorizontalAlignment="Right"> + <Grid HorizontalAlignment="Right" Margin="0 0 0 82"> <ContentControl Content="{Binding}"> <ContentControl.Style> <Style TargetType="ContentControl"> diff --git a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs index ce0a6ad43..2f9356da3 100644 --- a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs +++ b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs @@ -293,7 +293,7 @@ namespace Tango.Integration.ExternalBridge foreach (var machine in machines.Where(x => !AvailableMachines.OfType<ExternalBridgeSignalRClient>().ToList().Exists(y => y.SerialNumber == x.SerialNumber))) { ExternalBridgeSignalRClient newMachine = null; - var knownMachine = KnownMachines.FirstOrDefault(x => x.SerialNumber == machine.SerialNumber); + var knownMachine = KnownMachines != null ? KnownMachines.FirstOrDefault(x => x.SerialNumber == machine.SerialNumber) : null; if (knownMachine == null) { |