From a09212417c7dcaadf6f1cd499828a62963c2792a Mon Sep 17 00:00:00 2001 From: jdevito Date: Fri, 28 Oct 2022 16:20:49 -0500 Subject: [PATCH] fix: removed property sets as recommended in discussion; removed 'if' statements before property sets in leave and end call methods --- .../VideoCodec/ZoomRoom/ZoomRoom.cs | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs index 60965ca0..cc0dfcd7 100644 --- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs +++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs @@ -2583,7 +2583,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom if (args.LoginAttemptCancelled) { trilist.SetBool(joinMap.MeetingPasswordRequired.JoinNumber, false); - _meetingPasswordRequired = false; return; } @@ -2595,7 +2594,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom if (args.LoginAttemptFailed) { // login attempt failed - _meetingPasswordRequired = false; return; } @@ -2820,24 +2818,24 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom public void LeaveMeeting() { - if (_meetingPasswordRequired) _meetingPasswordRequired = false; - if (_waitingForUserToAcceptOrRejectIncomingCall) _waitingForUserToAcceptOrRejectIncomingCall = false; - + _meetingPasswordRequired = false; + _waitingForUserToAcceptOrRejectIncomingCall = false; + SendText("zCommand Call Leave"); } public override void EndCall(CodecActiveCallItem call) { - if (_meetingPasswordRequired) _meetingPasswordRequired = false; - if (_waitingForUserToAcceptOrRejectIncomingCall) _waitingForUserToAcceptOrRejectIncomingCall = false; + _meetingPasswordRequired = false; + _waitingForUserToAcceptOrRejectIncomingCall = false; SendText("zCommand Call Disconnect"); } public override void EndAllCalls() { - if (_meetingPasswordRequired) _meetingPasswordRequired = false; - if (_waitingForUserToAcceptOrRejectIncomingCall) _waitingForUserToAcceptOrRejectIncomingCall = false; + _meetingPasswordRequired = false; + _waitingForUserToAcceptOrRejectIncomingCall = false; SendText("zCommand Call Disconnect"); }