From fe14d543d6bee0b28b791b776e04e14e7f8a30d0 Mon Sep 17 00:00:00 2001
From: Neil Dorin <ndorin@pepperdash.com>
Date: Fri, 20 Dec 2019 14:17:21 -0700
Subject: [PATCH] Fixes issue with OutputAudioRouteNameFeebdack not being fired

---
 .../Essentials_DM/Chassis/DmChassisController.cs   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmChassisController.cs b/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmChassisController.cs
index 632e555a..136f3c86 100644
--- a/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmChassisController.cs	
+++ b/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmChassisController.cs	
@@ -747,13 +747,19 @@ namespace PepperDash.Essentials.DM
                 case DMInputEventIds.UsbRoutedToEventId:
                     {
                         Debug.Console(2, this, "DM Input {0} UsbRoutedToEventId", args.Number);
-                        UsbInputRoutedToFeebacks[args.Number].FireUpdate();
+                        if(UsbInputRoutedToFeebacks[args.Number] != null)
+                            UsbInputRoutedToFeebacks[args.Number].FireUpdate();
+                        else
+                            Debug.Console(1, this, "No index of {0} found in UsbInputRoutedToFeedbacks");
                         break;
                     }
                 case DMInputEventIds.HdcpCapabilityFeedbackEventId:
                     {
                         Debug.Console(2, this, "DM Input {0} HdcpCapabilityFeedbackEventId", args.Number);
-                        InputCardHdcpCapabilityFeedbacks[args.Number].FireUpdate();
+                        if (InputCardHdcpCapabilityFeedbacks[args.Number] != null)
+                            InputCardHdcpCapabilityFeedbacks[args.Number].FireUpdate();
+                        else
+                            Debug.Console(1, this, "No index of {0} found in InputCardHdcpCapabilityFeedbacks");
                         break;
                     }
                 default:
@@ -818,6 +824,10 @@ namespace PepperDash.Essentials.DM
                     {
                         AudioOutputFeedbacks[output].FireUpdate();
                     }
+                    if (OutputAudioRouteNameFeedbacks.ContainsKey(output))
+                    {
+                        OutputAudioRouteNameFeedbacks[output].FireUpdate();
+                    }
                     break;
                 }
                 case DMOutputEventIds.OutputNameEventId: