pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-01-31 13:25:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into bugfix/SystemMonitor-IndexOutOfRange

Browse Source
This commit is contained in:
Trevor Payne
2020-08-18 10:55:07 -05:00
committed by GitHub
parent 78f9142b35 211665c0c4
commit 3325d81cab
19 changed files with 2071 additions and 2132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
PepperDashEssentials/ControlSystem.cs
View File

@@ -53,7 +53,7 @@ namespace PepperDash.Essentials
if (Debug.DoNotLoadOnNextBoot)
{
CrestronConsole.AddNewConsoleCommand(s => GoWithLoadDeferred(), "go", "Loads configuration file",
CrestronConsole.AddNewConsoleCommand(s => GoWithLoad(), "go", "Loads configuration file",
ConsoleAccessLevelEnum.AccessOperator);
}
@@ -96,18 +96,13 @@ namespace PepperDash.Essentials
if (!Debug.DoNotLoadOnNextBoot)
{
GoWithLoad(null);
GoWithLoad();
return;
}
SystemMonitor.ProgramInitialization.ProgramInitializationComplete = true;
}
private void GoWithLoadDeferred()
{
CrestronInvoke.BeginInvoke(GoWithLoad);
}
/// <summary>
/// Determines if the program is running on a processor (appliance) or server (VC-4).
///
@@ -180,7 +175,7 @@ namespace PepperDash.Essentials
/// <summary>
/// Begins the process of loading resources including plugins and configuration data
/// </summary>
public void GoWithLoad(object notUsed)
public void GoWithLoad()
{
try
{