Merge remote-tracking branch 'gcranston/master' into #2-hibernate

Author: gbakeman

WinNUT_V2/WinNUT_GUI/Shutdown_Gui.vb

@@ -102,6 +102,12 @@ Public Class Shutdown_Gui
         System.Threading.Thread.Sleep(1000)
         WinNUT.Shutdown_Action()
         Run_Timer.Enabled = False
+        Me.Shutdown_Timer.Stop()
+        Me.Shutdown_Timer.Enabled = False
+        Me.Grace_Timer.Stop()
+        Me.Grace_Timer.Enabled = False
+        Me.Hide()
+        Me.Close()
     End Sub
 
     Private Sub Run_Timer_Tick(sender As Object, e As EventArgs) Handles Run_Timer.Tick

WinNUT_V2/WinNUT_GUI/WinNUT.vb

@@ -62,11 +62,11 @@ Public Class WinNUT
     Private Event On_Battery()
     Private Event On_Line()
     Private Event Data_Updated()
-    Private Shared Event UpdateNotifyIconStr(ByVal Reason As String, ByVal Message As String)
-    Private Shared Event UpdateBatteryState(ByVal Reason As String)
+    Private Event UpdateNotifyIconStr(ByVal Reason As String, ByVal Message As String)
+    Private Event UpdateBatteryState(ByVal Reason As String)
 
     'Handle sleep/hibernate mode from windows API
-    Declare Function SetSystemPowerState Lib "kernel32" (ByVal fSuspend As Integer, ByVal fForce As Integer) As Integer
+	Declare Function SetSuspendState Lib "PowrProf" (ByVal Hibernate As Integer, ByVal ForceCritical As Integer, ByVal DisableWakeEvent As Integer) As Integer    
 
     Public Property UpdateMethod() As String
         Get
@@ -1039,9 +1039,9 @@ Public Class WinNUT
             Case 0
                 Process.Start("C:\WINDOWS\system32\Shutdown.exe", "-f -s -t 0")
             Case 1
-                SetSystemPowerState(True, 0)
+                SetSuspendState(False, False, True)  'Suspend
             Case 2
-                SetSystemPowerState(False, 0)
+                SetSuspendState(True, False, True)   'Hibernate
         End Select
     End Sub