diff options
| author |  Ameer J | 2021-07-08 14:46:31 -0400 |
|---|---|---|
| committer |  GitHub | 2021-07-08 14:46:31 -0400 |
| commit | 5edc96f4a47bff64cfd97f0c91e42b56ab58b2d7 (patch) | |
| tree | bd1e570a3f0594557e28516b0974aa07f67ad616 /src/core/core.cpp | |
| parent | Out of bound blit (#6531) (diff) | |
| parent | general: Code formatting improvements (diff) | |
| download | yuzu-5edc96f4a47bff64cfd97f0c91e42b56ab58b2d7.tar.gz yuzu-5edc96f4a47bff64cfd97f0c91e42b56ab58b2d7.tar.xz yuzu-5edc96f4a47bff64cfd97f0c91e42b56ab58b2d7.zip | |
Merge pull request #6539 from lat9nq/default-setting
general: Move most settings' defaults and labels into their definition
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index e6f1aa0e7..891f1cb49 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 | const auto gamecard_path = Settings::values.gamecard_path.GetValue(); |
| 268 | GetGameFileFromPath(virtual_filesystem, Settings::values.gamecard_path)); | 268 | fs_controller.SetGameCard(GetGameFileFromPath(virtual_filesystem, gamecard_path)); |
| 269 | } | 269 | } |
| 270 | } | 270 | } |
| 271 | 271 | ||