From 67f0ae92ef06860c6d4036862cfcff8b2b8e84f2 Mon Sep 17 00:00:00 2001
From: Jason Alborough <jalborough@pepperdash.com>
Date: Tue, 18 Aug 2020 10:00:53 -0400
Subject: [PATCH] Adds null check before running RunRouteAction event in Cisco
 Spark class. Fixes spelling error and other minor cleanup.

---
 .../Room/Types/EssentialsHuddleVtc1Room.cs    | 38 ++++++++++---------
 .../VideoCodec/CiscoCodec/CiscoSparkCodec.cs  |  8 +++-
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs b/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs
index 99278b32..ca137a27 100644
--- a/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs
+++ b/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs
@@ -59,13 +59,8 @@ namespace PepperDash.Essentials
 			set
 			{
 				_SourceListKey = value;
-				if(VideoCodec is IHasExternalSourceSwitching) 
-				{
-					if((VideoCodec as IHasExternalSourceSwitching).ExternalSourceListEnabled)
-					{
-						SetCodecExternalSources();
-					}
-				}
+				SetCodecExternalSources();
+				
 			}
 		}
 
@@ -698,28 +693,35 @@ namespace PepperDash.Essentials
 		/// </summary>
 		private void SetCodecExternalSources()
 		{
-			
-			string codecTieLine = "";
-			codecTieLine = ConfigReader.ConfigObject.TieLines.SingleOrDefault(x => x.DestinationKey == VideoCodec.Key).DestinationPort;
-			(VideoCodec as IHasExternalSourceSwitching).ClearExternalSources();
-			(VideoCodec as IHasExternalSourceSwitching).RunRouteAction = RunRouteAction;
-			var srcList =  ConfigReader.ConfigObject.SourceLists.SingleOrDefault(x => x.Key == SourceListKey).Value.OrderBy(kv => kv.Value.Order);;
+			var videoCodecWithExternalSwitching = VideoCodec as IHasExternalSourceSwitching;
+
+			if (videoCodecWithExternalSwitching == null)
+			{
+				return;
+			}
+			else
+			{
+				string codecTieLine = "";
+				codecTieLine = ConfigReader.ConfigObject.TieLines.SingleOrDefault(x => x.DestinationKey == VideoCodec.Key).DestinationPort;
+				videoCodecWithExternalSwitching.ClearExternalSources();
+				videoCodecWithExternalSwitching.RunRouteAction = RunRouteAction;
+				var srcList = ConfigReader.ConfigObject.SourceLists.SingleOrDefault(x => x.Key == SourceListKey).Value.OrderBy(kv => kv.Value.Order); ;
 
 				foreach (var kvp in srcList)
 				{
 					var srcConfig = kvp.Value;
-					
-					if (kvp.Key != "codecOsd" && kvp.Key != "roomOff")
+
+					if (kvp.Key != DefaultCodecRouteString && kvp.Key != "roomOff")
 					{
 
-						(VideoCodec as IHasExternalSourceSwitching).AddExternalSource(codecTieLine, kvp.Key, srcConfig.PreferredName, PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.eExternalSourceType.desktop);
-						(VideoCodec as IHasExternalSourceSwitching).SetExternalSourceState(kvp.Key, PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.eExternalSourceMode.Ready);
+						videoCodecWithExternalSwitching.AddExternalSource(codecTieLine, kvp.Key, srcConfig.PreferredName, PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.eExternalSourceType.desktop);
+						videoCodecWithExternalSwitching.SetExternalSourceState(kvp.Key, PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.eExternalSourceMode.Ready);
 
 
 					}
 				}
 			}
-			
+		}
 		
         #region IPrivacy Members
 
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
index 108aab0b..9759cfdd 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs	
@@ -21,7 +21,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 {
     enum eCommandType { SessionStart, SessionEnd, Command, GetStatus, GetConfiguration };
 	public enum eExternalSourceType {camera, desktop, document_camera, mediaplayer, PC, whiteboard, other}
-	public enum eExternalSourceMode {Ready, NotReady, Hiddon, Error} 
+	public enum eExternalSourceMode {Ready, NotReady, Hidden, Error} 
 
     public class CiscoSparkCodec : VideoCodecBase, IHasCallHistory, IHasCallFavorites, IHasDirectory,
         IHasScheduleAwareness, IOccupancyStatusProvider, IHasCodecLayouts, IHasCodecSelfView,
@@ -868,7 +868,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 						CiscoCodecEvents.RootObject eventReceived = new CiscoCodecEvents.RootObject();
                         JsonConvert.PopulateObject(response, eventReceived);
 						Debug.Console(2, this, "*** Got an External Source Selection {0} {1}", eventReceived, eventReceived.Event.UserInterface, eventReceived.Event.UserInterface.Presentation.ExternalSource.Selected.SourceIdentifier.Value);
-						RunRouteAction(eventReceived.Event.UserInterface.Presentation.ExternalSource.Selected.SourceIdentifier.Value, null);
+
+						if (RunRouteAction != null)
+						{
+							RunRouteAction(eventReceived.Event.UserInterface.Presentation.ExternalSource.Selected.SourceIdentifier.Value, null);
+						}
 					}
                 }
                 else if (response.IndexOf("\"CommandResponse\":{") > -1 || response.IndexOf("\"CommandResponse\": {") > -1)