summaryrefslogtreecommitdiff
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorGravatar lat9nq2021-06-28 15:58:16 -0400
committerGravatar lat9nq2021-06-28 17:32:17 -0400
commitb91b76df4fe27d781bd95ddb89b78ff54df57029 (patch)
treeabd3de5c02b036ec936a70599e496ba1d45d7849 /src/core/core.cpp
parentconfiguration: Defer to common/settings for per-game settings defaults (diff)
downloadyuzu-b91b76df4fe27d781bd95ddb89b78ff54df57029.tar.gz
yuzu-b91b76df4fe27d781bd95ddb89b78ff54df57029.tar.xz
yuzu-b91b76df4fe27d781bd95ddb89b78ff54df57029.zip
general: Make most settings a BasicSetting
Creates a new BasicSettings class in common/settings, and forces setting a default and label for each setting that uses it in common/settings. Moves defaults and labels from both frontends into common settings. Creates a helper function in each frontend to facillitate reading the settings now with the new default and label properties. Settings::Setting is also now a subclass of Settings::BasicSetting. Also adds documentation for both Setting and BasicSetting.
Diffstat (limited to 'src/core/core.cpp')
-rw-r--r--src/core/core.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index e6f1aa0e7..fc6ec9512 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -263,9 +263,9 @@ struct System::Impl {
263 if (Settings::values.gamecard_inserted) { 263 if (Settings::values.gamecard_inserted) {
264 if (Settings::values.gamecard_current_game) { 264 if (Settings::values.gamecard_current_game) {
265 fs_controller.SetGameCard(GetGameFileFromPath(virtual_filesystem, filepath)); 265 fs_controller.SetGameCard(GetGameFileFromPath(virtual_filesystem, filepath));
266 } else if (!Settings::values.gamecard_path.empty()) { 266 } else if (!Settings::values.gamecard_path.GetValue().empty()) {
267 fs_controller.SetGameCard( 267 fs_controller.SetGameCard(GetGameFileFromPath(
268 GetGameFileFromPath(virtual_filesystem, Settings::values.gamecard_path)); 268 virtual_filesystem, static_cast<std::string>(Settings::values.gamecard_path)));
269 } 269 }
270 } 270 }
271 271