From 010bf8e23b38852ffaab18eb5d6f6fdb38305907 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=D0=BD=D0=B0=D0=B1?= Date: Tue, 17 Jun 2025 18:22:32 +0200 Subject: [PATCH] Don't pretend to fall off the end of Nodes::useSocks5Proxy() [334/404] Building CXX object src/CMakeFiles/feather.dir/utils/nodes.cpp.o /home/nabijaczleweli/uwu/feather/src/utils/nodes.cpp:503:1: warning: non-void function does not return a value in all control paths [-Wreturn-type] 503 | } | ^ 1 warning generated. --- src/utils/nodes.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/utils/nodes.cpp b/src/utils/nodes.cpp index f924ea6a..d9702f2d 100644 --- a/src/utils/nodes.cpp +++ b/src/utils/nodes.cpp @@ -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() { -- 2.52.0