pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-04-12 03:57:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Smash system monitor bug

Browse source
This commit is contained in:
Heath Volmer 2019-01-24 11:20:24 -07:00
parent 8d03bef34f
commit 530e1ebcb8
3 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
PepperDashEssentials/AppServer/CotijaSystemController.cs
View file

@ -138,7 +138,9 @@ namespace PepperDash.Essentials
/// <param name="programEventType"></param>
void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType)
{
if (programEventType == eProgramStatusEventType.Stopping && WSClient.Connected)
if (programEventType == eProgramStatusEventType.Stopping
&& WSClient != null
&& WSClient.Connected)
{
CleanUpWebsocketClient();
}

4
PepperDashEssentials/AppServer/Messengers/Ddvc01VtcMessenger.cs
View file

@ -203,7 +203,9 @@ namespace PepperDash.Essentials.AppServer.Messengers
currentCallString = EISC.GetString(SCurrentCallNumber),
currentDialString = EISC.GetString(SCurrentDialString),
isInCall = EISC.GetString(SHookState) == "Connected",
hasDirectory = true,
hasRecents = true,
hasCameras = true
});
}

19
PepperDashEssentials/AppServer/RoomBridges/CotijaDdvc01RoomBridge.cs
View file

@ -75,7 +75,7 @@ namespace PepperDash.Essentials.Room.Cotija
/// <summary>
/// 72
/// </summary>
public const uint SourceHasChanged = 72;
public const uint SourceHasChanged = 71;
/// <summary>
/// 261 - The start of the range of speed dial visibles
/// </summary>
@ -176,6 +176,15 @@ namespace PepperDash.Essentials.Room.Cotija
/// 621
/// </summary>
public const uint SourceIconJoinStart = 621;
/// <summary>
/// 641
/// </summary>
public const uint SourceKeyJoinStart = 641;
/// <summary>
/// 661
/// </summary>
public const uint SourceTypeJoinStart = 661;
}
@ -507,10 +516,10 @@ namespace PepperDash.Essentials.Room.Cotija
var name = EISC.StringOutput[StringJoin.SourceNameJoinStart + i].StringValue;
if(string.IsNullOrEmpty(name))
break;
var icon = EISC.StringOutput[651 + i].StringValue;
var key = EISC.StringOutput[671 + i].StringValue;
var type = EISC.StringOutput[BoolJoin.SourceShareDisableStartJoin + i].StringValue;
var disableShare = EISC.BooleanOutput[601 + i].BoolValue;
var icon = EISC.StringOutput[StringJoin.SourceIconJoinStart + i].StringValue;
var key = EISC.StringOutput[StringJoin.SourceKeyJoinStart + i].StringValue;
var type = EISC.StringOutput[StringJoin.SourceTypeJoinStart + i].StringValue;
var disableShare = EISC.BooleanOutput[BoolJoin.SourceShareDisableStartJoin + i].BoolValue;
Debug.Console(0, this, "Adding source {0} '{1}'", key, name);
var newSLI = new SourceListItem{