summaryrefslogtreecommitdiffstats
path: root/src/citra
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2017-08-23 04:37:03 +0200
committerbunnei <bunneidev@gmail.com>2017-08-26 05:10:00 +0200
commitc781aea947e275a970a3431a36160b769865993d (patch)
tree1c1971aeba3563beb3e2b092a751f07df0c40dfd /src/citra
parenttelemetry_session: Log telemetry ID. (diff)
downloadyuzu-c781aea947e275a970a3431a36160b769865993d.tar
yuzu-c781aea947e275a970a3431a36160b769865993d.tar.gz
yuzu-c781aea947e275a970a3431a36160b769865993d.tar.bz2
yuzu-c781aea947e275a970a3431a36160b769865993d.tar.lz
yuzu-c781aea947e275a970a3431a36160b769865993d.tar.xz
yuzu-c781aea947e275a970a3431a36160b769865993d.tar.zst
yuzu-c781aea947e275a970a3431a36160b769865993d.zip
Diffstat (limited to 'src/citra')
-rw-r--r--src/citra/config.cpp4
-rw-r--r--src/citra/default_ini.h7
2 files changed, 11 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() {
static_cast<u16>(sdl2_config->GetInteger("Debugging", "gdbstub_port", 24689));
// Web Service
+ Settings::values.enable_telemetry =
+ sdl2_config->GetBoolean("WebService", "enable_telemetry", true);
Settings::values.telemetry_endpoint_url = sdl2_config->Get(
"WebService", "telemetry_endpoint_url", "https://services.citra-emu.org/api/telemetry");
+ Settings::values.citra_username = sdl2_config->Get("WebService", "citra_username", "");
+ Settings::values.citra_token = sdl2_config->Get("WebService", "citra_token", "");
}
void Config::Reload() {
diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h
index 9ea779dd8..666a2ad70 100644
--- a/src/citra/default_ini.h
+++ b/src/citra/default_ini.h
@@ -176,7 +176,14 @@ use_gdbstub=false
gdbstub_port=24689
[WebService]
+# Whether or not to enable telemetry
+# 0: No, 1 (default): Yes
+enable_telemetry =
# Endpoint URL for submitting telemetry data
telemetry_endpoint_url =
+# Username and token for Citra Web Service
+# See https://services.citra-emu.org/ for more info
+citra_username =
+citra_token =
)";
}