diff options
| author | 2023-08-14 16:28:13 -0700 | |
|---|---|---|
| committer | 2023-08-14 16:28:13 -0700 | |
| commit | 6d665a94eaad4530d84dcc2adf1f91fa2ff6e502 (patch) | |
| tree | 087b83d6e1ef1b9e3f4d217c1ffd784227f37aeb /src | |
| parent | Merge pull request #11273 from t895/setup-completion (diff) | |
| parent | Revert "Silence nifm spam" (diff) | |
| download | yuzu-6d665a94eaad4530d84dcc2adf1f91fa2ff6e502.tar.gz yuzu-6d665a94eaad4530d84dcc2adf1f91fa2ff6e502.tar.xz yuzu-6d665a94eaad4530d84dcc2adf1f91fa2ff6e502.zip | |
Merge pull request #11256 from FearlessTobi/revert-10075
Partially Revert "Silence nifm spam"
Diffstat (limited to '')
| -rw-r--r-- | src/core/internal_network/network.cpp | 8 | ||||
| -rw-r--r-- | src/core/internal_network/network_interface.cpp | 9 |
2 files changed, 15 insertions, 2 deletions
diff --git a/src/core/internal_network/network.cpp b/src/core/internal_network/network.cpp index 28f89c599..bda9fa2e0 100644 --- a/src/core/internal_network/network.cpp +++ b/src/core/internal_network/network.cpp | |||
| @@ -476,7 +476,13 @@ NetworkInstance::~NetworkInstance() { | |||
| 476 | std::optional<IPv4Address> GetHostIPv4Address() { | 476 | std::optional<IPv4Address> GetHostIPv4Address() { |
| 477 | const auto network_interface = Network::GetSelectedNetworkInterface(); | 477 | const auto network_interface = Network::GetSelectedNetworkInterface(); |
| 478 | if (!network_interface.has_value()) { | 478 | if (!network_interface.has_value()) { |
| 479 | LOG_DEBUG(Network, "GetSelectedNetworkInterface returned no interface"); | 479 | // Only print the error once to avoid log spam |
| 480 | static bool print_error = true; | ||
| 481 | if (print_error) { | ||
| 482 | LOG_ERROR(Network, "GetSelectedNetworkInterface returned no interface"); | ||
| 483 | print_error = false; | ||
| 484 | } | ||
| 485 | |||
| 480 | return {}; | 486 | return {}; |
| 481 | } | 487 | } |
| 482 | 488 | ||
diff --git a/src/core/internal_network/network_interface.cpp b/src/core/internal_network/network_interface.cpp index 4c909a6d3..7c37f660b 100644 --- a/src/core/internal_network/network_interface.cpp +++ b/src/core/internal_network/network_interface.cpp | |||
| @@ -200,7 +200,14 @@ std::optional<NetworkInterface> GetSelectedNetworkInterface() { | |||
| 200 | }); | 200 | }); |
| 201 | 201 | ||
| 202 | if (res == network_interfaces.end()) { | 202 | if (res == network_interfaces.end()) { |
| 203 | LOG_DEBUG(Network, "Couldn't find selected interface \"{}\"", selected_network_interface); | 203 | // Only print the error once to avoid log spam |
| 204 | static bool print_error = true; | ||
| 205 | if (print_error) { | ||
| 206 | LOG_ERROR(Network, "Couldn't find selected interface \"{}\"", | ||
| 207 | selected_network_interface); | ||
| 208 | print_error = false; | ||
| 209 | } | ||
| 210 | |||
| 204 | return std::nullopt; | 211 | return std::nullopt; |
| 205 | } | 212 | } |
| 206 | 213 | ||