artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1887 from FearlessTobi/port-4476

Browse source 
Port citra-emu/citra#4476: "web_service: move telemetry condition from TelemetrySession constructor to destructor"
This commit is contained in:
bunnei 2018-12-10 21:47:22 -05:00 committed by GitHub
parent 1aa9106244 ca4e20b4e0
commit 9eb9b344c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/core/telemetry_session.cpp
View file

@ -103,13 +103,8 @@ 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>(
backend = std::make_unique<WebService::TelemetryJson>(Settings::values.web_api_url, Settings::values.web_api_url, Settings::values.yuzu_username, Settings::values.yuzu_token);
Settings::values.yuzu_username,
Settings::values.yuzu_token);
} else {
backend = std::make_unique<Telemetry::NullVisitor>();
}
#else #else
backend = std::make_unique<Telemetry::NullVisitor>(); backend = std::make_unique<Telemetry::NullVisitor>();
#endif #endif
@ -180,7 +175,8 @@ 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);
backend->Complete(); if (Settings::values.enable_telemetry)
backend->Complete();
backend = nullptr; backend = nullptr;
} }