andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-23 02:00:20 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

refactor: move iOS/macOS NE specific disconnect logic to the top of disconnectFromVpn method (#2100)

Browse Source
This commit is contained in:
yyy-amnezia
2025-12-27 05:09:11 +02:00
committed by GitHub
parent a4c4ef71fb
commit 6bac948633
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/vpnconnection.cpp
+6 -5
View File
@@ -537,6 +537,12 @@ QString VpnConnection::bytesPerSecToText(quint64 bytes)
void VpnConnection::disconnectFromVpn() void VpnConnection::disconnectFromVpn()
{ {
#if defined(Q_OS_IOS) || defined(MACOS_NE)
// iOS/macOS NE use IosController directly; m_vpnProtocol is not set there.
IosController::Instance()->disconnectVpn();
disconnect(&m_checkTimer, &QTimer::timeout, IosController::Instance(), &IosController::checkStatus);
#endif
if (m_vpnProtocol.isNull()) { if (m_vpnProtocol.isNull()) {
emit connectionStateChanged(Vpn::ConnectionState::Disconnected); emit connectionStateChanged(Vpn::ConnectionState::Disconnected);
return; return;
@@ -573,11 +579,6 @@ void VpnConnection::disconnectFromVpn()
m_vpnProtocol->stop(); m_vpnProtocol->stop();
#endif #endif
#if defined(Q_OS_IOS) || defined(MACOS_NE)
IosController::Instance()->disconnectVpn();
disconnect(&m_checkTimer, &QTimer::timeout, IosController::Instance(), &IosController::checkStatus);
#endif
#if !defined(Q_OS_ANDROID) && !defined(AMNEZIA_DESKTOP) #if !defined(Q_OS_ANDROID) && !defined(AMNEZIA_DESKTOP)
m_vpnProtocol->deleteLater(); m_vpnProtocol->deleteLater();
#endif #endif