yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

network_interface: Replace default return value with std::nullopt

This commit is contained in:
Morph 2021-08-21 10:27:36 -04:00
parent d10d480642
commit a32a7dacf4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/network/network_interface.cpp
View File

@ -180,11 +180,11 @@ std::vector<NetworkInterface> GetAvailableNetworkInterfaces() {
#endif #endif
std::optional<NetworkInterface> GetSelectedNetworkInterface() { std::optional<NetworkInterface> GetSelectedNetworkInterface() {
const std::string& selected_network_interface = Settings::values.network_interface.GetValue(); const auto& selected_network_interface = Settings::values.network_interface.GetValue();
const auto network_interfaces = Network::GetAvailableNetworkInterfaces(); const auto network_interfaces = Network::GetAvailableNetworkInterfaces();
if (network_interfaces.size() == 0) { if (network_interfaces.size() == 0) {
LOG_ERROR(Network, "GetAvailableNetworkInterfaces returned no interfaces"); LOG_ERROR(Network, "GetAvailableNetworkInterfaces returned no interfaces");
return {}; return std::nullopt;
} }
const auto res = const auto res =
@ -192,12 +192,12 @@ std::optional<NetworkInterface> GetSelectedNetworkInterface() {
return iface.name == selected_network_interface; return iface.name == selected_network_interface;
}); });
if (res != network_interfaces.end()) { if (res == network_interfaces.end()) {
return *res;
} else {
LOG_ERROR(Network, "Couldn't find selected interface \"{}\"", selected_network_interface); LOG_ERROR(Network, "Couldn't find selected interface \"{}\"", selected_network_interface);
return {}; return std::nullopt;
} }
return *res;
} }
} // namespace Network } // namespace Network