Merge branch 'dev' into bugfix/wrong-fields-type-shadowsocks-config

2023-02-09 13:10:26 +00:00 · 2023-02-09 13:10:26 +00:00 · 1f048a6d04
commit 1f048a6d04
parent 16969bc39b 58cf10ffb2
10 changed files with 33 additions and 19 deletions
--- a/client/protocols/shadowsocksvpnprotocol.cpp
+++ b/client/protocols/shadowsocksvpnprotocol.cpp
@ -109,8 +109,6 @@ QString ShadowSocksVpnProtocol::shadowSocksExecPath()
 {
 #ifdef Q_OS_WIN
    return Utils::executable(QString("ss/ss-local"), true);
-#elif defined Q_OS_LINUX
-    return Utils::usrExecutable(QString("ss-local"));
 #else
    return Utils::executable(QString("/ss-local"), true);
 #endif