diff options
| author | 2021-06-28 19:41:39 -0400 | |
|---|---|---|
| committer | 2021-06-28 20:56:17 -0400 | |
| commit | 0e5c74bc9e18974f3169766aec2dee0effdc8df1 (patch) | |
| tree | a9150b749734430daa422af6c9a1f79e1ada6e08 /src/core/telemetry_session.cpp | |
| parent | yuzu qt: Make most UISettings a BasicSetting (diff) | |
| download | yuzu-0e5c74bc9e18974f3169766aec2dee0effdc8df1.tar.gz yuzu-0e5c74bc9e18974f3169766aec2dee0effdc8df1.tar.xz yuzu-0e5c74bc9e18974f3169766aec2dee0effdc8df1.zip | |
core, input_common: Miscellaneous fixes
bcat: Fix settings access
telemetry_session: Fix settings accesses
So this is what I get for testing with the web service disabled.
touch_from_button: Fix settings access for clang
Diffstat (limited to 'src/core/telemetry_session.cpp')
| -rw-r--r-- | src/core/telemetry_session.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/core/telemetry_session.cpp b/src/core/telemetry_session.cpp index 44b8bab5b..066cb23e4 100644 --- a/src/core/telemetry_session.cpp +++ b/src/core/telemetry_session.cpp | |||
| @@ -135,7 +135,7 @@ u64 RegenerateTelemetryId() { | |||
| 135 | 135 | ||
| 136 | bool VerifyLogin(const std::string& username, const std::string& token) { | 136 | bool VerifyLogin(const std::string& username, const std::string& token) { |
| 137 | #ifdef ENABLE_WEB_SERVICE | 137 | #ifdef ENABLE_WEB_SERVICE |
| 138 | return WebService::VerifyLogin(Settings::values.web_api_url, username, token); | 138 | return WebService::VerifyLogin(Settings::values.web_api_url.GetValue(), username, token); |
| 139 | #else | 139 | #else |
| 140 | return false; | 140 | return false; |
| 141 | #endif | 141 | #endif |
| @@ -152,7 +152,8 @@ TelemetrySession::~TelemetrySession() { | |||
| 152 | 152 | ||
| 153 | #ifdef ENABLE_WEB_SERVICE | 153 | #ifdef ENABLE_WEB_SERVICE |
| 154 | auto backend = std::make_unique<WebService::TelemetryJson>( | 154 | auto backend = std::make_unique<WebService::TelemetryJson>( |
| 155 | Settings::values.web_api_url, Settings::values.yuzu_username, Settings::values.yuzu_token); | 155 | Settings::values.web_api_url.GetValue(), Settings::values.yuzu_username.GetValue(), |
| 156 | Settings::values.yuzu_token.GetValue()); | ||
| 156 | #else | 157 | #else |
| 157 | auto backend = std::make_unique<Telemetry::NullVisitor>(); | 158 | auto backend = std::make_unique<Telemetry::NullVisitor>(); |
| 158 | #endif | 159 | #endif |
| @@ -242,7 +243,8 @@ void TelemetrySession::AddInitialInfo(Loader::AppLoader& app_loader, | |||
| 242 | bool TelemetrySession::SubmitTestcase() { | 243 | bool TelemetrySession::SubmitTestcase() { |
| 243 | #ifdef ENABLE_WEB_SERVICE | 244 | #ifdef ENABLE_WEB_SERVICE |
| 244 | auto backend = std::make_unique<WebService::TelemetryJson>( | 245 | auto backend = std::make_unique<WebService::TelemetryJson>( |
| 245 | Settings::values.web_api_url, Settings::values.yuzu_username, Settings::values.yuzu_token); | 246 | Settings::values.web_api_url.GetValue(), Settings::values.yuzu_username.GetValue(), |
| 247 | Settings::values.yuzu_token.GetValue()); | ||
| 246 | field_collection.Accept(*backend); | 248 | field_collection.Accept(*backend); |
| 247 | return backend->SubmitTestcase(); | 249 | return backend->SubmitTestcase(); |
| 248 | #else | 250 | #else |