Small socket, power mode changes

- Socket Disconnect method now calls the Close_Socket method and raises the SocketDisconnected event in more cases
- System Resume event now tries to disconnect the UPS if it's still considered connected.

Author: gbakeman

WinNUT_V2/WinNUT-Client/WinNUT.vb

@@ -330,14 +330,19 @@ Public Class WinNUT
     Private Sub SystemEvents_PowerModeChanged(sender As Object, e As Microsoft.Win32.PowerModeChangedEventArgs)
         LogFile.LogTracing("PowerModeChangedEvent: " & [Enum].GetName(GetType(Microsoft.Win32.PowerModes), e.Mode), LogLvl.LOG_NOTICE, Me)
         Select Case e.Mode
+            ' Note: Windows does not wait for applications to handle a Suspend event.
             Case Microsoft.Win32.PowerModes.Suspend
                 LogFile.LogTracing("Suspending WinNUT operations...", LogLvl.LOG_NOTICE, Me, StrLog.Item(AppResxStr.STR_MAIN_GOTOSLEEP))
                 UPSDisconnect()
             Case Microsoft.Win32.PowerModes.Resume
+                If UPS_Device IsNot Nothing AndAlso UPS_Device.IsConnected Then
+                    LogFile.LogTracing("Trying to disconnect connected UPS after system resume...", LogLvl.LOG_NOTICE, Me)
+                    UPSDisconnect()
+                End If
                 If My.Settings.NUT_AutoReconnect Then
-                        LogFile.LogTracing("Reconnecting after system resume.", LogLvl.LOG_NOTICE, Me, StrLog.Item(AppResxStr.STR_MAIN_EXITSLEEP))
-                        UPS_Connect(True)
-                    End If
+                    LogFile.LogTracing("Reconnecting after system resume.", LogLvl.LOG_NOTICE, Me, StrLog.Item(AppResxStr.STR_MAIN_EXITSLEEP))
+                    UPS_Connect(True)
+                End If
         End Select
     End Sub
 

WinNUT_V2/WinNUT-Client_Common/Nut_Socket.vb

@@ -161,16 +161,14 @@ Public Class Nut_Socket
     ''' <summary>
     ''' Perform various functions necessary to disconnect the socket from the NUT server.
     ''' </summary>
-    ''' <param name="Forceful">Skip sending the LOGOUT command to the NUT server. Unknown effects.</param>
+    ''' <param name="forceful">Skip sending the LOGOUT command to the NUT server. Unknown effects.</param>
     Public Sub Disconnect(Optional forceful = False)
         If Not forceful AndAlso IsConnected AndAlso IsLoggedIn Then
-            Try
-                Query_Data("LOGOUT")
-            Finally
-                Close_Socket()
-                RaiseEvent SocketDisconnected()
-            End Try
+            Query_Data("LOGOUT")
         End If
+
+        Close_Socket()
+        RaiseEvent SocketDisconnected()
     End Sub
 
     ''' <summary>