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

Merge branch 'main' into hotfix/DmRmcScalerCVideoMute

Browse Source
This commit is contained in:
Andrew Welker
2023-07-27 12:05:32 -06:00
committed by GitHub
parent 2ffe24fd93 ef719b0a64
commit 0cfcf61d6b
7 changed files with 428 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
essentials-framework/Essentials DM/Essentials_DM/AirMedia/AirMediaController.cs
View File

@@ -129,7 +129,7 @@ namespace PepperDash.Essentials.DM.AirMedia
else
AirMedia.DisplayControl.DisableAutomaticRouting();
return true;
return base.CustomActivate();
}
public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)