pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-15 12:44:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(essentials): Resolves null ref in LinkZoomRoomToApi

Browse Source
This commit is contained in:
Neil Dorin
2022-09-29 14:11:41 -06:00
parent f82b7f8f12
commit ca1cbb6e05
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasPresentationOnlyMeeting.cs
View File

@@ -4,8 +4,8 @@
{ {
void StartSharingOnlyMeeting(); void StartSharingOnlyMeeting();
void StartSharingOnlyMeeting(eSharingMeetingMode displayMode); void StartSharingOnlyMeeting(eSharingMeetingMode displayMode);
void StartSharingOnlyMeeting(eSharingMeetingMode displayMode, ushort duration); void StartSharingOnlyMeeting(eSharingMeetingMode displayMode, uint duration);
void StartSharingOnlyMeeting(eSharingMeetingMode displayMode, ushort duration, string password); void StartSharingOnlyMeeting(eSharingMeetingMode displayMode, uint duration, string password);
void StartNormalMeetingFromSharingOnlyMeeting(); void StartNormalMeetingFromSharingOnlyMeeting();
} }

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

@@ -2401,7 +2401,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
var meetingInfoCodec = this as IHasMeetingInfo; var meetingInfoCodec = this as IHasMeetingInfo;
if (meetingInfoCodec != null) if (meetingInfoCodec != null)
{ {
trilist.SetBool(joinMap.MeetingCanRecord.JoinNumber, meetingInfoCodec.MeetingInfo.CanRecord); if (meetingInfoCodec.MeetingInfo != null)
{
trilist.SetBool(joinMap.MeetingCanRecord.JoinNumber, meetingInfoCodec.MeetingInfo.CanRecord);
}
meetingInfoCodec.MeetingInfoChanged += (o, a) => meetingInfoCodec.MeetingInfoChanged += (o, a) =>
{ {
@@ -2528,8 +2531,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
trilist.SetSigFalseAction(joinMap.StartNormalMeetingFromSharingOnlyMeeting.JoinNumber, StartNormalMeetingFromSharingOnlyMeeting); trilist.SetSigFalseAction(joinMap.StartNormalMeetingFromSharingOnlyMeeting.JoinNumber, StartNormalMeetingFromSharingOnlyMeeting);
trilist.SetStringSigAction(joinMap.SubmitPassword.JoinNumber, SubmitPassword); trilist.SetStringSigAction(joinMap.SubmitPassword.JoinNumber, SubmitPassword);
//trilist.SetSigFalseAction(joinMap.CancelPasswordPrompt.JoinNumber, () =>
// OnPasswordRequired(false, false, true, ""));
// Subscribe to call status to clear ShowPasswordPrompt when in meeting // Subscribe to call status to clear ShowPasswordPrompt when in meeting
this.CallStatusChange += (o, a) => this.CallStatusChange += (o, a) =>
@@ -2588,7 +2589,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
var wirelessInfoCodec = this as IZoomWirelessShareInstructions; var wirelessInfoCodec = this as IZoomWirelessShareInstructions;
if (wirelessInfoCodec != null) if (wirelessInfoCodec != null)
{ {
SetSharingStateJoins(Status.Sharing, trilist, joinMap); if (Status != null && Status.Sharing != null)
{
SetSharingStateJoins(Status.Sharing, trilist, joinMap);
}
wirelessInfoCodec.ShareInfoChanged += (o, a) => wirelessInfoCodec.ShareInfoChanged += (o, a) =>
{ {
@@ -3490,7 +3494,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
StartSharingOnlyMeeting(displayMode, DefaultMeetingDurationMin, String.Empty); StartSharingOnlyMeeting(displayMode, DefaultMeetingDurationMin, String.Empty);
} }
public void StartSharingOnlyMeeting(eSharingMeetingMode displayMode, ushort duration) public void StartSharingOnlyMeeting(eSharingMeetingMode displayMode, uint duration)
{ {
StartSharingOnlyMeeting(displayMode, duration, String.Empty); StartSharingOnlyMeeting(displayMode, duration, String.Empty);
} }