Moved the flag for the 10-minute timer.

lucidcode · Nov 28, 2014 · 1aa9cf7 · 1aa9cf7
1 parent 7f01486
commit 1aa9cf7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git 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}"
+        "ProductCode" = "8:{C0F6BB14-216A-488B-A66B-7A73027764E7}"
-        "PackageCode" = "8:{D9B53D11-F058-4FF2-AEBE-AFEC67F19417}"
+        "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
diff --git 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
@@ -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: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.3.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]