Merge remote-tracking branch 'origin/bugfix/ecs-541-1' into bugfix/ecs-535

This commit is contained in:
Heath Volmer
2017-10-23 07:26:06 -06:00

View File

@@ -97,6 +97,8 @@ namespace PepperDash.Essentials.UIDrivers.VC
/// <param name="codec"></param>
public EssentialsVideoCodecUiDriver(BasicTriListWithSmartObject triList, IAVDriver parent, VideoCodecBase codec)
: base(triList)
{
try
{
if (codec == null)
throw new ArgumentNullException("Codec cannot be null");
@@ -187,6 +189,11 @@ namespace PepperDash.Essentials.UIDrivers.VC
TriList.SetSigFalseAction(UIBoolJoin.CallStopSharingPress, Codec.StopSharing);
}
catch (Exception e)
{
Debug.Console(1, "Exception in VideoCodecUiDriver Constructor: {0}", e);
}
}
/// <summary>
/// Updates the current shared source label on the call list when the source changes
@@ -272,7 +279,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
ShowKeypad();
DialStringBuilder.Remove(0, DialStringBuilder.Length);
DialStringFeedback.FireUpdate();
Parent.ShowNotificationRibbon("Disonnected", 2000);
Parent.ShowNotificationRibbon("Disconnected", 2000);
}
break;
case eCodecCallStatus.Disconnecting: