From 1aa9cf79cc0ff75cbe0400f53766f0bfdfbf2ac3 Mon Sep 17 00:00:00 2001 From: IAmCoder Date: Fri, 28 Nov 2014 13:33:50 -0500 Subject: [PATCH] Moved the flag for the 10-minute timer. --- .../Lucid Scribe Yocto PowerRelay.vdproj | 12 ++++++------ Lucid Scribe - Yocto PowerRelay.suo | Bin 28672 -> 28672 bytes Yocto PowerRelay/PlugoutHandler.cs | 2 +- Yocto PowerRelay/Properties/AssemblyInfo.cs | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Installer/Lucid Scribe Yocto PowerRelay.vdproj b/Installer/Lucid Scribe Yocto PowerRelay.vdproj index 2442045..225d908 100644 --- a/Installer/Lucid Scribe Yocto PowerRelay.vdproj +++ b/Installer/Lucid Scribe Yocto PowerRelay.vdproj @@ -58,13 +58,13 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_4210C5B26664BD7B4C21B3A1C66C3BE8" + "OwnerKey" = "8:_8A04AA9B98A94963AADF2135268ACC52" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_8A04AA9B98A94963AADF2135268ACC52" + "OwnerKey" = "8:_4210C5B26664BD7B4C21B3A1C66C3BE8" "MsmSig" = "8:_UNDEFINED" } } @@ -164,7 +164,7 @@ { "Name" = "8:.NET Framework" "Message" = "8:[VSDNETMSG]" - "FrameworkVersion" = "8:3.5.30729 " + "FrameworkVersion" = "8:3.5.30729 " "AllowLaterVersions" = "11:FALSE" "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=76617" } @@ -351,15 +351,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Lucid Scribe Yocto PowerRelay" - "ProductCode" = "8:{AFA8A7E2-F919-46E3-9ADA-3028F74E7119}" - "PackageCode" = "8:{D9B53D11-F058-4FF2-AEBE-AFEC67F19417}" + "ProductCode" = "8:{C0F6BB14-216A-488B-A66B-7A73027764E7}" + "PackageCode" = "8:{7D9E5DE7-A71F-4D41-919E-A9E8106B97BE}" "UpgradeCode" = "8:{F7366005-EA41-478D-BED9-08441C13A31E}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:1.0.3" + "ProductVersion" = "8:1.0.4" "Manufacturer" = "8:lucidcode" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://www.lucidcode.com/Contact" diff --git a/Lucid Scribe - Yocto PowerRelay.suo b/Lucid Scribe - Yocto PowerRelay.suo index 6df5ffcbb7554fdff9705076022481b1d96ce80b..829c593d5fbc24f0b6734729e035e510037033ca 100644 GIT binary patch delta 500 zcmZp8z}WDBaYGIZn}bN0tuXiGB9_3(&b)?`4Omzv|6uXq5ocgv_zwk>1vykEak6Z# zU_H&k%cudA5rN8rWHy&@`7`n|YN2V^{Du2GBgn|jUwHkP*{nGj7?>F*Z}ha-+#u+} z$ioj*&VytMt0<7;IQgfL7f_GwUdi&z3DAC@(oY{0@Y`3H*+j|>9?!+$84EXbiUiIZh> z1?y=RUIq=Ii~v*?B(u4M%b$^#K^rK# zi_Hy!E{r@Ni%gJIv5EpY1(SaYdGRuG1DQNXa+6Dh{U;x0G2Hw`IDmsk1S$hE0pyy= zB{CN#A7L@rTp}C7$)Ss+Z}S&5e^#&`OLRgwSde5Uf6)P&2=si3ZU~1KlEmgOx~rH3 zRqwUCd2;&yir%CmI-`zx6UXHB1{Ws>dg}|inm8Gn7`oQhgk=_ImgE;XPd;GS!NHDX z!sHU85Dq3Jfz4lx&ah0LXs9okoS#=xl%Eq*2GN_GKgr@S$X}DcSOoC!0=1YTYb&ul z!7u0m6oCOSd$OLtUtxxxDg6ORzkEO8))h27>7KT`ol?#-*>!uTg&G}oVO>n$@`CNFjK IhP(hq049FN#Q*>R diff --git a/Yocto PowerRelay/PlugoutHandler.cs b/Yocto PowerRelay/PlugoutHandler.cs index f168ea9..dd0d823 100644 --- a/Yocto PowerRelay/PlugoutHandler.cs +++ b/Yocto PowerRelay/PlugoutHandler.cs @@ -86,7 +86,6 @@ public override void Trigger() SwitchOffThread.Start(); // And allow it to turn back on in 10 - AllowToSwitchOn = false; AllowToSwitchBackOnThread = new Thread(AllowToSwitchBackOn); AllowToSwitchBackOnThread.Start(); } @@ -111,6 +110,7 @@ public void SwitchOff() Trigger(); SwitchingOff = false; On = false; + AllowToSwitchOn = false; } public void AllowToSwitchBackOn() diff --git a/Yocto PowerRelay/Properties/AssemblyInfo.cs b/Yocto PowerRelay/Properties/AssemblyInfo.cs index a2e9b06..e165247 100644 --- a/Yocto PowerRelay/Properties/AssemblyInfo.cs +++ b/Yocto PowerRelay/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.3.0")] -[assembly: AssemblyFileVersion("1.0.3.0")] +[assembly: AssemblyVersion("1.0.4.0")] +[assembly: AssemblyFileVersion("1.0.4.0")]