Merge pull request #261 from nabijaczleweli/master

Don't pretend to fall off the end of Nodes::useSocks5Proxy()
This commit is contained in:
tobtoht
2025-06-17 16:47:49 +00:00
committed by GitHub
+4 -5
View File
@@ -479,7 +479,8 @@ bool Nodes::useSocks5Proxy(const FeatherNode &node) {
return false;
}
if (conf()->get(Config::proxy).toInt() == Config::Proxy::None) {
const auto config_proxy = conf()->get(Config::proxy).toInt();
if (config_proxy == Config::Proxy::None) {
return false;
}
@@ -492,14 +493,12 @@ bool Nodes::useSocks5Proxy(const FeatherNode &node) {
return true;
}
if (conf()->get(Config::proxy).toInt() == Config::Proxy::Tor) {
if (config_proxy == Config::Proxy::Tor) {
// Don't use socks5 proxy if initial sync traffic is excluded.
return this->useOnionNodes();
}
if (conf()->get(Config::proxy).toInt() != Config::Proxy::None) {
return true;
}
return true;
}
void Nodes::updateModels() {