summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorGravatar spholz2021-08-12 21:32:53 +0200
committerGravatar spholz2021-08-12 21:32:53 +0200
commit1e98e738283ccb81303d29305188ac825ecfcba9 (patch)
tree3e82e0ce341efd5aad25584d381235365260dd1a /src/common
parentMerge branch 'yuzu-emu:master' into fix-lan-play (diff)
downloadyuzu-1e98e738283ccb81303d29305188ac825ecfcba9.tar.gz
yuzu-1e98e738283ccb81303d29305188ac825ecfcba9.tar.xz
yuzu-1e98e738283ccb81303d29305188ac825ecfcba9.zip
configuration: add option to select network interface
This commit renames the "Services" tab to "Network" and adds a combobox that allows the user to select the network interface that yuzu should use. This new setting is now used to get the local IP address in Network::GetHostIPv4Address. This prevents yuzu from selecting the wrong network interface and thus using the wrong IP address. The return type of Network::GetHostIPv4Adress has also been changed.
Diffstat (limited to 'src/common')
-rw-r--r--src/common/settings.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/settings.h b/src/common/settings.h
index a88ee045d..e1ae72c7a 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -433,9 +433,10 @@ struct Values {
433 BasicSetting<std::string> log_filter{"*:Info", "log_filter"}; 433 BasicSetting<std::string> log_filter{"*:Info", "log_filter"};
434 BasicSetting<bool> use_dev_keys{false, "use_dev_keys"}; 434 BasicSetting<bool> use_dev_keys{false, "use_dev_keys"};
435 435
436 // Services 436 // Network
437 BasicSetting<std::string> bcat_backend{"none", "bcat_backend"}; 437 BasicSetting<std::string> bcat_backend{"none", "bcat_backend"};
438 BasicSetting<bool> bcat_boxcat_local{false, "bcat_boxcat_local"}; 438 BasicSetting<bool> bcat_boxcat_local{false, "bcat_boxcat_local"};
439 BasicSetting<std::string> network_interface{std::string(), "network_interface"};
439 440
440 // WebService 441 // WebService
441 BasicSetting<bool> enable_telemetry{true, "enable_telemetry"}; 442 BasicSetting<bool> enable_telemetry{true, "enable_telemetry"};