diff --git a/MES_Wind.suo b/MES_Wind.suo index 8a6437d584b0bf17ba40e0638f27741d2a8eb465..4030410b4a4da32b5b73e3a69587c8d63aed5a9b 100644 Binary files a/MES_Wind.suo and b/MES_Wind.suo differ diff --git a/MES_Wind/bin/Debug/MES_Wind.exe b/MES_Wind/bin/Debug/MES_Wind.exe index cd763358ecb4764ec4c56b8ba6e737a624425614..d535522614768b7cea2f49811fa90d36672e073b 100644 Binary files a/MES_Wind/bin/Debug/MES_Wind.exe and b/MES_Wind/bin/Debug/MES_Wind.exe differ diff --git a/MES_Wind/bin/Debug/MES_Wind.pdb b/MES_Wind/bin/Debug/MES_Wind.pdb index 459542cd102bf8e8677e9054119fe8102b27222f..e5d3a29a70385188af2c839cba1a82e69703c3a8 100644 Binary files a/MES_Wind/bin/Debug/MES_Wind.pdb and b/MES_Wind/bin/Debug/MES_Wind.pdb differ diff --git a/MES_Wind/bin/Debug/MES_Wind.vshost.exe.manifest b/MES_Wind/bin/Debug/MES_Wind.vshost.exe.manifest new file mode 100644 index 0000000000000000000000000000000000000000..061c9ca950d0e8bb952c52799fb401a6614ad640 --- /dev/null +++ b/MES_Wind/bin/Debug/MES_Wind.vshost.exe.manifest @@ -0,0 +1,11 @@ +п»ї<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/> + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"> + <security> + <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3"> + <requestedExecutionLevel level="asInvoker" uiAccess="false"/> + </requestedPrivileges> + </security> + </trustInfo> +</assembly> diff --git a/MES_Wind/frmMain.cs b/MES_Wind/frmMain.cs index 52a957ab01fc35fd666a1c7cec6ba5d4ae42d666..8b5ba58da8ebe6e2b668af0812fef4d6d4ea85c8 100644 --- a/MES_Wind/frmMain.cs +++ b/MES_Wind/frmMain.cs @@ -287,9 +287,14 @@ namespace MES_Wind return rval; } - // so, we start at source power Point + // so, we start at source power Point; actually call this foreach source point public void checkPowerPoint(PowerPointObject sourcePoint) { + if (!sourcePoint.powerIsON) { + // so we have source without power + MessageBox.Show("checkPowerPoint called with disabled source point"); + return; + } // looking for unbroken lines and switch power for this point foreach (PowerLineObject line in sourcePoint.lines) { if (!line.broken && !line.toPoint.powerIsON) { diff --git a/MES_Wind/obj/Debug/MES_Wind.exe b/MES_Wind/obj/Debug/MES_Wind.exe index cd763358ecb4764ec4c56b8ba6e737a624425614..d535522614768b7cea2f49811fa90d36672e073b 100644 Binary files a/MES_Wind/obj/Debug/MES_Wind.exe and b/MES_Wind/obj/Debug/MES_Wind.exe differ diff --git a/MES_Wind/obj/Debug/MES_Wind.pdb b/MES_Wind/obj/Debug/MES_Wind.pdb index 459542cd102bf8e8677e9054119fe8102b27222f..e5d3a29a70385188af2c839cba1a82e69703c3a8 100644 Binary files a/MES_Wind/obj/Debug/MES_Wind.pdb and b/MES_Wind/obj/Debug/MES_Wind.pdb differ