summaryrefslogtreecommitdiff
path: root/src/citra/config.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2017-08-26 20:15:15 -0400
committerGravatar GitHub2017-08-26 20:15:15 -0400
commit22fc378fe9f3314b08d81ffaaf57fd8688e9e3cc (patch)
treed263eaca71ee08c3f9b81441b42bcd0e35977510 /src/citra/config.cpp
parentSidebySide Layout (#2859) (diff)
parentweb_backend: Fix CPR bug where Winsock is not properly initializing. (diff)
downloadyuzu-22fc378fe9f3314b08d81ffaaf57fd8688e9e3cc.tar.gz
yuzu-22fc378fe9f3314b08d81ffaaf57fd8688e9e3cc.tar.xz
yuzu-22fc378fe9f3314b08d81ffaaf57fd8688e9e3cc.zip
Merge pull request #2897 from bunnei/telemetry-ui
Telemetry UI and final touches
Diffstat (limited to 'src/citra/config.cpp')
-rw-r--r--src/citra/config.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index 73846ed91..3869b6b5d 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -156,8 +156,12 @@ void Config::ReadValues() {
156 static_cast<u16>(sdl2_config->GetInteger("Debugging", "gdbstub_port", 24689)); 156 static_cast<u16>(sdl2_config->GetInteger("Debugging", "gdbstub_port", 24689));
157 157
158 // Web Service 158 // Web Service
159 Settings::values.enable_telemetry =
160 sdl2_config->GetBoolean("WebService", "enable_telemetry", true);
159 Settings::values.telemetry_endpoint_url = sdl2_config->Get( 161 Settings::values.telemetry_endpoint_url = sdl2_config->Get(
160 "WebService", "telemetry_endpoint_url", "https://services.citra-emu.org/api/telemetry"); 162 "WebService", "telemetry_endpoint_url", "https://services.citra-emu.org/api/telemetry");
163 Settings::values.citra_username = sdl2_config->Get("WebService", "citra_username", "");
164 Settings::values.citra_token = sdl2_config->Get("WebService", "citra_token", "");
161} 165}
162 166
163void Config::Reload() { 167void Config::Reload() {