Fixed shutdown bug.

Fully switched over to Task Scheduler.

Updated the version number to 2.0.0.0.

Author: taylorflatt

VERSION

@@ -1 +1 @@
-1.4.0.0
+2.0.0.0

WindowsShutdownTimer.exe

@@ -38,8 +38,8 @@ public Options(TimerForm parent)
                     else
                     {
                         // Windows 7 doesn't have the last run time so I need to do something else.
-                        if (Environment.OSVersion.Version.Major == 6 && Environment.OSVersion.Version.Minor == 1)
-                            last_shutdown_label.Text = "N/A";
+                        if (timerWindow.GetLastRunTime(TimerForm.DEFAULT_TASK_NAME) == default(DateTime))
+                            last_shutdown_label.Text = Convert.ToString(Properties.Settings.Default.ShutdownTimer);
                         else
                             last_shutdown_label.Text = Convert.ToString(timerWindow.GetLastRunTime(TimerForm.DEFAULT_TASK_NAME));
                     }

WindowsShutdownTimer/Options.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.4.1.0")]
-[assembly: AssemblyFileVersion("1.4.1.0")]
+[assembly: AssemblyVersion("2.0.0.0")]
+[assembly: AssemblyFileVersion("2.0.0.0")]

WindowsShutdownTimer/Properties/AssemblyInfo.cs

@@ -26,7 +26,7 @@ public partial class TimerForm : Form
 
         public const string DEFAULT_TIMER_DISPLAY = "0 days 0 hr 0 min 0 sec";
         public const string DEFAULT_TASK_NAME = "ScheduledShutdownTimer";
-        private const string SHUTDOWN_COMMAND = "echo \"Hello!\" ";
+        private const string SHUTDOWN_COMMAND = "/s /c \"Scheduled Computer shutdown via the Windows Shutdown Timer App\" /t 1";
 
         /// <summary>
         /// Sets the initial program parameters.
@@ -94,7 +94,7 @@ public TimerForm()
                     }
                     catch (NoTimerExists)
                     {
-                        StopLocalTimer(true);
+                        StopLocalTimer();
                     }
                     catch(Exception)
                     {
@@ -378,7 +378,7 @@ private void CreateShutdownTimer(int numSeconds)
                         td.Settings.Enabled = true;
 
                         td.Triggers.Add(new TimeTrigger(_shutdownTime));
-                        td.Actions.Add(new ExecAction("cmd.exe", SHUTDOWN_COMMAND + " seconds entered: " + numSeconds, null));
+                        td.Actions.Add(new ExecAction("shutdown", SHUTDOWN_COMMAND, null));
 
                         TaskService.Instance.RootFolder.RegisterTaskDefinition(DEFAULT_TASK_NAME, td);
 
@@ -423,9 +423,25 @@ private void ModifyShutdownTimer(int numSeconds)
                         }
                     }
 
-                    task.Definition.Settings.Enabled = true;    // Resets the status of the task to Ready in case it was modified.
+                    // Add the new trigger after making sure it is the only one.
                     task.Definition.Triggers.Add(new TimeTrigger(_shutdownTime));
 
+                    if (task.Definition.Actions.Count == 1)
+                        task.Definition.Actions.RemoveAt(0);
+
+                    else if (task.Definition.Actions.Count > 1)
+                    {
+                        for (int index = 0; index < task.Definition.Actions.Count - 1; index++)
+                        {
+                            task.Definition.Actions.RemoveAt(index);
+                        }
+                    }
+
+                    // Add the new action after making sure it is the only one.
+                    task.Definition.Actions.Add(new ExecAction("shutdown", SHUTDOWN_COMMAND, null));
+
+                    // Reset the status in case it was set as anything but "Ready"
+                    task.Definition.Settings.Enabled = true;
                     task.RegisterChanges();
 
                     Properties.Settings.Default.ShutdownTimer = _shutdownTime;
@@ -642,14 +658,14 @@ private void time_remaining_timer_Tick(object sender, EventArgs e)
             }
             catch(NoTimerExists)
             {
-                if (TimerDisabled(DEFAULT_TASK_NAME))
+                if (TimerExists(DEFAULT_TASK_NAME) && TimerDisabled(DEFAULT_TASK_NAME))
                     StopLocalTimer(true);
                 else
                     StopLocalTimer();
             }
             catch(TimerEnded)
             {
-                if (TimerDisabled(DEFAULT_TASK_NAME))
+                if (TimerExists(DEFAULT_TASK_NAME) && TimerDisabled(DEFAULT_TASK_NAME))
                     StopLocalTimer(true);
                 else
                     StopLocalTimer();
@@ -816,7 +832,6 @@ private void notifyIcon_DoubleClick(object sender, EventArgs e)
         {
             RestoreForm();
             TimerForm_Resize(null, null);
-            
         }
 
         /// <summary>