fix: resolves issues where no room combiner is present in system config

PepperDash · Jun 11, 2024 · ed8e087 · ed8e087
1 parent cb98063
commit ed8e087
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/UserInterface/CiscoCodecUserInterface/MobileControl/McVideoCodecTouchpanelController.cs b/src/UserInterface/CiscoCodecUserInterface/MobileControl/McVideoCodecTouchpanelController.cs
@@ -91,14 +91,14 @@ private void PostActivateSubscribeForMobileControlUpdates()
 					return;
 				}
 				var bridge = Mc.GetRoomMessenger(_props.DefaultRoomKey);
-				Debug.LogMessage(LogEventLevel.Debug, $"[McTouchpanelController] Got Bridge: {bridge.RoomName}", this);
 				if (bridge == null)
 				{
 					Debug.LogMessage(LogEventLevel.Debug, $"[McTouchpanelController] No Mobile Control bridge for {_props.DefaultRoomKey} found ", this);
 					return;
 				}
+                Debug.LogMessage(LogEventLevel.Debug, $"[McTouchpanelController] Got Bridge: {bridge.RoomName}", this);
 
-				_bridge = bridge;
+                _bridge = bridge;
 				Debug.LogMessage(LogEventLevel.Debug, $"[McTouchpanelController] Setting AppUrl", this);
 
 				Debug.LogMessage(LogEventLevel.Debug, $"[McTouchpanelController] Mobile Control Room Bridge Found {_bridge.Key}", this);

diff --git a/src/UserInterface/CiscoCodecUserInterface/MobileControl/McVideoCodecUserInterfaceRouter.cs b/src/UserInterface/CiscoCodecUserInterface/MobileControl/McVideoCodecUserInterfaceRouter.cs
@@ -114,9 +114,12 @@ internal void Activate(McVideoCodecTouchpanelController ui)
                 HandleRoomCombineScenarioChanged();       
             };
 
-			//subscribe to events for routing buttons from codec ui to mobile control
-			_combinerHandler.EssentialsRoomCombiner.RoomCombinationScenarioChanged +=
-				Combiner_RoomCombinationScenarioChanged_Lockout_EventHandler;
+			if (_combinerHandler.EssentialsRoomCombiner != null)
+			{
+				//subscribe to events for routing buttons from codec ui to mobile control
+				_combinerHandler.EssentialsRoomCombiner.RoomCombinationScenarioChanged +=
+					Combiner_RoomCombinationScenarioChanged_Lockout_EventHandler;
+			}
 
 			_extensionsHandler.UiExtensionsClickedEvent +=
 				VideoCodecUiExtensionsClickedMcEventHandler;