Reset display values on lost connection

Fix inconsistent UI when a connection is lost (not manually disconnected)

Author: gbakeman

WinNUT_V2/WinNUT-Client/WinNUT.vb

@@ -346,6 +346,24 @@ Public Class WinNUT
         End If
     End Sub
 
+    Private Sub UPS_Lostconnect() Handles UPS_Device.Lost_Connect
+        LogFile.LogTracing("Notify user of lost connection", LogLvl.LOG_ERROR, Me,
+            String.Format(StrLog.Item(AppResxStr.STR_MAIN_LOSTCONNECT), UPS_Device.Nut_Config.Host, UPS_Device.Nut_Config.Port))
+        ' UPSDisconnect()
+
+        ReInitDisplayValues()
+        If UPS_Device.Nut_Config.AutoReconnect And UPS_Retry <= UPS_MaxRetry Then
+            ActualAppIconIdx = AppIconIdx.IDX_ICO_RETRY
+        Else
+            ActualAppIconIdx = AppIconIdx.IDX_ICO_OFFLINE
+        End If
+
+        UpdateIcon_NotifyIcon()
+        RaiseEvent UpdateNotifyIconStr("Lost Connect", Nothing)
+        RaiseEvent UpdateBatteryState("Lost Connect")
+        LogFile.LogTracing("Update Icon", LogLvl.LOG_DEBUG, Me)
+    End Sub
+
     ''' <summary>
     ''' Perform final actions to wrap up a disconnected UPS.
     ''' </summary>
@@ -587,24 +605,6 @@ Public Class WinNUT
         HasFocus = False
     End Sub
 
-    Private Sub UPS_Lostconnect() Handles UPS_Device.Lost_Connect
-        LogFile.LogTracing("Notify user of lost connection", LogLvl.LOG_ERROR, Me,
-            String.Format(StrLog.Item(AppResxStr.STR_MAIN_LOSTCONNECT), UPS_Device.Nut_Config.Host, UPS_Device.Nut_Config.Port))
-        ' UPSDisconnect()
-
-        'ReInitDisplayValues()
-        If UPS_Device.Nut_Config.AutoReconnect And UPS_Retry <= UPS_MaxRetry Then
-            ActualAppIconIdx = AppIconIdx.IDX_ICO_RETRY
-        Else
-            ActualAppIconIdx = AppIconIdx.IDX_ICO_OFFLINE
-        End If
-
-        UpdateIcon_NotifyIcon()
-        RaiseEvent UpdateNotifyIconStr("Lost Connect", Nothing)
-        RaiseEvent UpdateBatteryState("Lost Connect")
-        LogFile.LogTracing("Update Icon", LogLvl.LOG_DEBUG, Me)
-    End Sub
-
     Public Shared Sub Event_ChangeStatus() Handles Me.On_Battery, Me.On_Line,
         UPS_Device.Lost_Connect, UPS_Device.Connected, UPS_Device.Disconnected, UPS_Device.New_Retry, UPS_Device.ReConnected
         ', UPS_Device.Unknown_UPS