summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGravatar lat9nq2021-06-28 19:41:39 -0400
committerGravatar lat9nq2021-06-28 20:56:17 -0400
commit0e5c74bc9e18974f3169766aec2dee0effdc8df1 (patch)
treea9150b749734430daa422af6c9a1f79e1ada6e08 /src/core
parentyuzu qt: Make most UISettings a BasicSetting (diff)
downloadyuzu-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')
-rw-r--r--src/core/hle/service/bcat/module.cpp2
-rw-r--r--src/core/telemetry_session.cpp8
2 files changed, 6 insertions, 4 deletions
diff --git a/src/core/hle/service/bcat/module.cpp b/src/core/hle/service/bcat/module.cpp
index 44e4d0509..f85444da8 100644
--- a/src/core/hle/service/bcat/module.cpp
+++ b/src/core/hle/service/bcat/module.cpp
@@ -579,7 +579,7 @@ void Module::Interface::CreateDeliveryCacheStorageServiceWithApplicationId(
579std::unique_ptr<Backend> CreateBackendFromSettings([[maybe_unused]] Core::System& system, 579std::unique_ptr<Backend> CreateBackendFromSettings([[maybe_unused]] Core::System& system,
580 DirectoryGetter getter) { 580 DirectoryGetter getter) {
581#ifdef YUZU_ENABLE_BOXCAT 581#ifdef YUZU_ENABLE_BOXCAT
582 if (Settings::values.bcat_backend == "boxcat") { 582 if (Settings::values.bcat_backend.GetValue() == "boxcat") {
583 return std::make_unique<Boxcat>(system.GetAppletManager(), std::move(getter)); 583 return std::make_unique<Boxcat>(system.GetAppletManager(), std::move(getter));
584 } 584 }
585#endif 585#endif
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
136bool VerifyLogin(const std::string& username, const std::string& token) { 136bool 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,
242bool TelemetrySession::SubmitTestcase() { 243bool 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