pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-16 21:24:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix an IF statement to be correct

Browse Source
This commit is contained in:
Andrew Welker
2020-11-30 13:42:27 -07:00
parent b41dd23c7f
commit 91dda3213e
1 changed files with 2099 additions and 2102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
View File

@@ -494,7 +494,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
{
if (a.PropertyName == "State")
{
Debug.Console(1, this, "[SetUpFeedbackActions] Status.Call.Sharing.PropertyChanged: {0}", Status.Call.Sharing.State);
SharingContentIsOnFeedback.FireUpdate();
ReceivingContent.FireUpdate();
}
@@ -905,9 +904,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
{
case "call":
{
Debug.Console(1, this, "[DeserializeResponse] sharing status 1: {0}", Status.Call.Sharing.State.ToString());
JsonConvert.PopulateObject(responseObj.ToString(), Configuration.Call);
Debug.Console(1, this, "[DeserializeResponse] sharing status 2: {0}", Status.Call.Sharing.State.ToString());
break;
}
@@ -1389,11 +1386,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
if (Status.Call != null)
{
var callStatus = Status.Call.Status;
Debug.Console(1, this, "[UpdateCallStatus] callStatus: {0}", callStatus.ToString());
// If not currently in a meeting, intialize the call object
if (callStatus != zStatus.eCallStatus.IN_MEETING || callStatus != zStatus.eCallStatus.CONNECTING_MEETING)
if (callStatus != zStatus.eCallStatus.IN_MEETING && callStatus != zStatus.eCallStatus.CONNECTING_MEETING)
{
Debug.Console(1, this, "Creating new Status.Call object");
Status.Call = new zStatus.Call {Status = callStatus};
SetUpCallFeedbackActions();