Use protocol from app settings on reconnect

ProtonVPN · Jul 29, 2024 · dcc068e · dcc068e
1 parent c56b250
commit dcc068e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/ProtonVPN.App/Core/Service/Vpn/VpnReconnector.cs b/src/ProtonVPN.App/Core/Service/Vpn/VpnReconnector.cs
@@ -266,7 +266,7 @@ private async Task ExecuteReconnectionAsync(VpnReconnectionSteps reconnectionSte
             switch (reconnectionStep)
             {
                 case VpnReconnectionSteps.SimilarOnSameProtocol:
-                    await ConnectToSimilarServerAsync(isToTryLastServer, _targetProfile?.VpnProtocol ?? _appSettings.GetProtocol());
+                    await ConnectToSimilarServerAsync(isToTryLastServer, _appSettings.GetProtocol());
                     break;
                 case VpnReconnectionSteps.SimilarOnSmartProtocol:
                     await ConnectToSimilarServerAsync(isToTryLastServer, VpnProtocol.Smart);

diff --git a/src/ProtonVPN.App/Settings/SettingsModalViewModel.cs b/src/ProtonVPN.App/Settings/SettingsModalViewModel.cs
@@ -675,8 +675,8 @@ public async Task OnVpnPlanChangedAsync(VpnPlanChangedEventArgs e)
 
         private void SetDisconnected()
         {
-            Disconnected = _vpnState.Status == VpnStatus.Disconnecting ||
-                           _vpnState.Status == VpnStatus.Disconnected;
+            Disconnected = _vpnState is not null &&
+                           _vpnState.Status is VpnStatus.Disconnecting or VpnStatus.Disconnected;
         }
 
         private void RefreshReconnectRequiredState(string settingChanged)