Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 2 insertions, 10 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml.cs
index 67d42a350..9c7496484 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml.cs
@@ -67,11 +67,11 @@ namespace Tango.MachineStudio.MachineDesigner.Views
             {
                 SetHighlightRegion(hardwareGrid);
             }
-            else if (e.DataContext is ApplicationVersion || e.DataContext is ApplicationOsVersion || e.DataContext is ApplicationDisplayPanelVersion || e.DataContext is ApplicationFirmwareVersion)
+            else if (e.DataContext is ApplicationOsVersion || e.DataContext is ApplicationDisplayPanelVersion || e.DataContext is ApplicationFirmwareVersion)
             {
                 SetHighlightRegion(gridTablet);
             }
-            else if (e.DataContext is EmbeddedFirmwareVersion || e.DataContext is EmbeddedSoftwareVersion)
+            else if (e.DataContext is EmbeddedFirmwareVersion)
             {
                 SetHighlightRegion(gridEmbedded);
             }
@@ -123,10 +123,6 @@ namespace Tango.MachineStudio.MachineDesigner.Views
             {
                 _vm.DropTouchPanel(e.Draggable.DataContext as ApplicationDisplayPanelVersion);
             }
-            else if (e.Draggable.DataContext is ApplicationVersion)
-            {
-                _vm.DropApplicationVersion(e.Draggable.DataContext as ApplicationVersion);
-            }
             else if (e.Draggable.DataContext is ApplicationOsVersion)
             {
                 _vm.DropApplicationOsVersion(e.Draggable.DataContext as ApplicationOsVersion);
@@ -143,10 +139,6 @@ namespace Tango.MachineStudio.MachineDesigner.Views
             {
                 _vm.DropEmbeddedFirmware(e.Draggable.DataContext as EmbeddedFirmwareVersion);
             }
-            else if (e.Draggable.DataContext is EmbeddedSoftwareVersion)
-            {
-                _vm.DropEmbeddedSoftware(e.Draggable.DataContext as EmbeddedSoftwareVersion);
-            }
         }
 
         private void MachineDrop(object sender, DropEventArgs e)