From ae23e48fd0a73c0840539007f4e0c744dd2e86f4 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Tue, 11 Jun 2019 22:09:20 -0600 Subject: [PATCH] Resolves issue with GenericRelay factory not returning device if portDeviceKey maps to a device that is not of type CrestronControlSystem --- PepperDashEssentials/ControlSystem.cs | 2 -- essentials-framework | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/PepperDashEssentials/ControlSystem.cs b/PepperDashEssentials/ControlSystem.cs index 8124beb7..9069bef4 100644 --- a/PepperDashEssentials/ControlSystem.cs +++ b/PepperDashEssentials/ControlSystem.cs @@ -356,8 +356,6 @@ namespace PepperDash.Essentials newDev = PepperDash.Essentials.DM.DeviceFactory.GetDevice(devConf); if (newDev == null) newDev = PepperDash.Essentials.Devices.Displays.DisplayDeviceFactory.GetDevice(devConf); - if (newDev == null) - newDev = PepperDash.Essentials.BridgeFactory.GetDevice(devConf); //if (newDev == null) // might want to consider the ability to override an essentials "type" //{ diff --git a/essentials-framework b/essentials-framework index 2c636c33..11f52e17 160000 --- a/essentials-framework +++ b/essentials-framework @@ -1 +1 @@ -Subproject commit 2c636c3347a406c4254d895789f40dd183f00ca9 +Subproject commit 11f52e170e452a2397b3dc0d685abe11345ae424