diff --git a/client/3rd-prebuilt b/client/3rd-prebuilt index bc450df2..e8795854 160000 --- a/client/3rd-prebuilt +++ b/client/3rd-prebuilt @@ -1 +1 @@ -Subproject commit bc450df2418540869e97a31c4dd76839989b1fa6 +Subproject commit e8795854a5cf27004fe78caecc90a961688d1d41 diff --git a/client/daemon/daemonlocalserver.cpp b/client/daemon/daemonlocalserver.cpp index 9d8feb68..9b8e9504 100644 --- a/client/daemon/daemonlocalserver.cpp +++ b/client/daemon/daemonlocalserver.cpp @@ -77,12 +77,12 @@ QString DaemonLocalServer::daemonPath() const { } if (dir.exists("amneziavpn")) { - logger.debug() << "/var/run/amnezia seems to be usable"; + logger.debug() << "/var/run/amneziavpn seems to be usable"; return VAR_PATH; } if (!dir.mkdir("amneziavpn")) { - logger.warning() << "Failed to create /var/run/amnezia"; + logger.warning() << "Failed to create /var/run/amneziavpn"; return TMP_PATH; } diff --git a/client/mozilla/shared/ipaddress.cpp b/client/mozilla/shared/ipaddress.cpp index 1f84ad07..95a2f2d0 100644 --- a/client/mozilla/shared/ipaddress.cpp +++ b/client/mozilla/shared/ipaddress.cpp @@ -29,8 +29,6 @@ IPAddress::IPAddress(const QString& ip) { if (m_prefixLength >= 128) { m_prefixLength = 128; } - } else { - // Q_ASSERT(false); } } diff --git a/client/platforms/linux/daemon/wireguardutilslinux.cpp b/client/platforms/linux/daemon/wireguardutilslinux.cpp index 32150ad5..a8b7b04a 100644 --- a/client/platforms/linux/daemon/wireguardutilslinux.cpp +++ b/client/platforms/linux/daemon/wireguardutilslinux.cpp @@ -76,7 +76,7 @@ bool WireguardUtilsLinux::addInterface(const InterfaceConfig& config) { QDir appPath(QCoreApplication::applicationDirPath()); QStringList wgArgs = {"-f", "amn0"}; - m_tunnel.start(appPath.filePath("wireguard-go"), wgArgs); + m_tunnel.start(appPath.filePath("../../client/bin/wireguard-go"), wgArgs); if (!m_tunnel.waitForStarted(WG_TUN_PROC_TIMEOUT)) { logger.error() << "Unable to start tunnel process due to timeout"; m_tunnel.kill();