fixup

OpenVPN · May 22, 2023 · e3c2984 · e3c2984
1 parent f7f9eec
commit e3c2984
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 8 deletions.
diff --git a/localization.c b/localization.c
@@ -314,7 +314,6 @@ LoadLocalizedIconEx(const UINT iconId, int cxDesired, int cyDesired)
                 iconId_pref = ID_ICO_CONNECTED_LEGACY;
                 break;
             case ID_ICO_DISCONNECTED:
-            case ID_ICO_IDLE_ERR:
                 iconId_pref = ID_ICO_DISCONNECTED_LEGACY;
                 break;
             case ID_ICO_CONNECTING:

diff --git a/openvpn-gui-res.h b/openvpn-gui-res.h
@@ -29,11 +29,10 @@
 #define ID_ICO_DISCONNECTED               93
 #define ID_ICO_EYE                        94
 #define ID_ICO_EYESTROKE                  95
-#define ID_ICO_CONNECTED_ERR              94
-#define ID_ICO_IDLE_ERR                   95
-#define ID_ICO_CONNECTED_LEGACY           96
-#define ID_ICO_CONNECTING_LEGACY          97
-#define ID_ICO_DISCONNECTED_LEGACY        98
+#define ID_ICO_CONNECTED_ERR              96
+#define ID_ICO_CONNECTED_LEGACY           97
+#define ID_ICO_CONNECTING_LEGACY          98
+#define ID_ICO_DISCONNECTED_LEGACY        99
 
 /* About Dialog */
 #define ID_DLG_ABOUT                     100

diff --git a/openvpn.c b/openvpn.c
@@ -379,6 +379,7 @@ OnStateChange(connection_t *c, char *data)
         if (!success)
         {
             SetDlgItemText(c->hwndStatus, ID_TXT_STATUS, LoadLocalizedString(IDS_NFO_STATE_ROUTE_ERROR));
+            SetStatusWinIcon(c->hwndStatus, ID_ICO_CONNECTED_ERR);
             return;
         }
 

diff --git a/res/connected.ico b/res/connected.ico
diff --git a/res/connected_error.ico b/res/connected_error.ico
diff --git a/res/connecting.ico b/res/connecting.ico
diff --git a/res/disconnected.ico b/res/disconnected.ico
diff --git a/res/openvpn-gui-res.rc b/res/openvpn-gui-res.rc
@@ -38,10 +38,9 @@ ID_ICO_APP           ICON  DISCARDABLE  "openvpn-gui.ico"
 ID_ICO_CONNECTED     ICON  DISCARDABLE  "connected.ico"
 ID_ICO_CONNECTING    ICON  DISCARDABLE  "connecting.ico"
 ID_ICO_DISCONNECTED  ICON  DISCARDABLE  "disconnected.ico"
+ID_ICO_CONNECTED_ERR ICON  DISCARDABLE  "connected_error.ico"
 ID_ICO_EYE           ICON  DISCARDABLE  "eye.ico"
 ID_ICO_EYESTROKE     ICON  DISCARDABLE  "eye-stroke.ico"
-ID_ICO_CONNECTED_ERR ICON  DISCARDABLE  "connected_error.ico"
-ID_ICO_IDLE_ERR      ICON  DISCARDABLE  "idle_error.ico"
 ID_ICO_CONNECTED_LEGACY     ICON  DISCARDABLE  "connected_old.ico"
 ID_ICO_CONNECTING_LEGACY    ICON  DISCARDABLE  "connecting_old.ico"
 ID_ICO_DISCONNECTED_LEGACY  ICON  DISCARDABLE  "disconnected_old.ico"
-Original file line number
+Diff line change
@@ Expand Up / @@ -379,6 +379,7 @@ OnStateChange(connection_t *c, char *data) @@
             if (!success)
             {
                 SetDlgItemText(c->hwndStatus, ID_TXT_STATUS, LoadLocalizedString(IDS_NFO_STATE_ROUTE_ERROR));
+                SetStatusWinIcon(c->hwndStatus, ID_ICO_CONNECTED_ERR);
                 return;
             }
@@ Expand Down @@