mirror of
https://github.com/PepperDash/Essentials.git
synced 2026-08-31 19:08:29 +00:00
fix: use continue instead of return when a touchpanel room bridge is missing, and register room bridges added via AddDefaultDeviceMessenger
This commit is contained in:
parent
695ab00c6e
commit
4926b005d6
2 changed files with 7 additions and 2 deletions
|
|
@ -512,6 +512,12 @@ namespace PepperDash.Essentials
|
||||||
{
|
{
|
||||||
simplMessenger.ConfigurationIsReady += Bridge_ConfigurationIsReady;
|
simplMessenger.ConfigurationIsReady += Bridge_ConfigurationIsReady;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (messenger is MobileControlBridgeBase roomBridge)
|
||||||
|
{
|
||||||
|
_roomBridges.Add(roomBridge);
|
||||||
|
}
|
||||||
|
|
||||||
this.LogVerbose(
|
this.LogVerbose(
|
||||||
"Adding default messenger with key {messengerKey} for path {messengerPath}",
|
"Adding default messenger with key {messengerKey} for path {messengerPath}",
|
||||||
messenger.Key,
|
messenger.Key,
|
||||||
|
|
|
||||||
|
|
@ -356,11 +356,10 @@ namespace PepperDash.Essentials.WebSocketServer
|
||||||
foreach (var client in touchpanelsToAdd)
|
foreach (var client in touchpanelsToAdd)
|
||||||
{
|
{
|
||||||
var bridge = _parent.GetRoomBridge(client.DefaultRoomKey);
|
var bridge = _parent.GetRoomBridge(client.DefaultRoomKey);
|
||||||
|
|
||||||
if (bridge == null)
|
if (bridge == null)
|
||||||
{
|
{
|
||||||
this.LogWarning("Unable to find room with key: {defaultRoomKey}", client.DefaultRoomKey);
|
this.LogWarning("Unable to find room with key: {defaultRoomKey}", client.DefaultRoomKey);
|
||||||
return;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
var (key, path) = GenerateClientToken(bridge, client.Key);
|
var (key, path) = GenerateClientToken(bridge, client.Key);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue