AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Crash on exit fix for Windows

Browse source
This commit is contained in:
pokamest 2023-10-04 16:09:03 +01:00
parent 70e6a3d303
commit 6f392ce126
3 changed files with 1 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/protocols/wireguardprotocol.cpp
View file

@ -101,8 +101,6 @@ void WireguardProtocol::stop()
#if defined(Q_OS_MAC) || defined(Q_OS_WIN) || defined(Q_OS_LINUX) #if defined(Q_OS_MAC) || defined(Q_OS_WIN) || defined(Q_OS_LINUX)
ErrorCode WireguardProtocol::startMzImpl() ErrorCode WireguardProtocol::startMzImpl()
{ {
qDebug() << "WireguardProtocol::startMzImpl():" << m_rawConfig;
m_impl->activate(m_rawConfig); m_impl->activate(m_rawConfig);
return ErrorCode::NoError; return ErrorCode::NoError;
} }

17
client/ui/controllers/connectionController.cpp
View file

@ -21,23 +21,6 @@ ConnectionController::ConnectionController(const QSharedPointer<ServersModel> &s
Qt::QueuedConnection); Qt::QueuedConnection);
} }
ConnectionController::~ConnectionController()
{
// todo use ConnectionController instead of using m_vpnConnection directly
#ifdef AMNEZIA_DESKTOP
if (m_vpnConnection->connectionState() != Vpn::ConnectionState::Disconnected) {
m_vpnConnection->disconnectFromVpn();
for (int i = 0; i < 50; i++) {
qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
QThread::msleep(100);
if (m_vpnConnection->isDisconnected()) {
break;
}
}
}
#endif
}
void ConnectionController::openConnection() void ConnectionController::openConnection()
{ {
int serverIndex = m_serversModel->getDefaultServerIndex(); int serverIndex = m_serversModel->getDefaultServerIndex();

2
client/ui/controllers/connectionController.h
View file

@ -19,7 +19,7 @@ public:
const QSharedPointer<ContainersModel> &containersModel, const QSharedPointer<ContainersModel> &containersModel,
const QSharedPointer<VpnConnection> &vpnConnection, QObject *parent = nullptr); const QSharedPointer<VpnConnection> &vpnConnection, QObject *parent = nullptr);
~ConnectionController(); ~ConnectionController() = default;
bool isConnected() const; bool isConnected() const;
bool isConnectionInProgress() const; bool isConnectionInProgress() const;