Merge branch 'master' of github.com:cbeuw/Cloak

4 years ago · 57138e84e5
parent 061b10e802 caca33a1a5
commit 57138e84e5
1 changed files with 3 additions and 1 deletions
--- a/cmd/ck-client/ck-client.go
+++ b/cmd/ck-client/ck-client.go
@ -85,7 +85,9 @@ func main() {
 	}

 	if ssPluginMode {
-		rawConfig.ProxyMethod = "shadowsocks"
+		if rawConfig.ProxyMethod == "" {
+			rawConfig.ProxyMethod = "shadowsocks"
+		}
 		// json takes precedence over environment variables
 		// i.e. if json field isn't empty, use that
 		if rawConfig.RemoteHost == "" {