lux/citra
1
0
Fork 0
mirror of https://git.h3cjp.net/H3cJP/citra.git synced 2024-12-26 05:06:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4476 from FearlessTobi/fix-testcase-sending

Browse source 
web_service: move telemetry condition from TelemetrySession constructor to destructor
This commit is contained in:
Weiyi Wang 2018-12-06 14:28:21 -05:00 committed by GitHub
parent ab0dba6a8b 630e3d6dea
commit b9f7c9142a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/core/telemetry_session.cpp
View file

@ -93,13 +93,9 @@ bool VerifyLogin(const std::string& username, const std::string& token) {
TelemetrySession::TelemetrySession() { TelemetrySession::TelemetrySession() {
#ifdef ENABLE_WEB_SERVICE #ifdef ENABLE_WEB_SERVICE
if (Settings::values.enable_telemetry) {
backend = std::make_unique<WebService::TelemetryJson>(Settings::values.web_api_url, backend = std::make_unique<WebService::TelemetryJson>(Settings::values.web_api_url,
Settings::values.citra_username, Settings::values.citra_username,
Settings::values.citra_token); Settings::values.citra_token);
} else {
backend = std::make_unique<Telemetry::NullVisitor>();
}
#else #else
backend = std::make_unique<Telemetry::NullVisitor>(); backend = std::make_unique<Telemetry::NullVisitor>();
#endif #endif
@ -199,6 +195,7 @@ TelemetrySession::~TelemetrySession() {
// This is just a placeholder to wrap up the session once the core completes and this is // This is just a placeholder to wrap up the session once the core completes and this is
// destroyed. This will be moved elsewhere once we are actually doing real I/O with the service. // destroyed. This will be moved elsewhere once we are actually doing real I/O with the service.
field_collection.Accept(*backend); field_collection.Accept(*backend);
if (Settings::values.enable_telemetry)
backend->Complete(); backend->Complete();
backend = nullptr; backend = nullptr;
} }