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/yuzu_cmd/yuzu.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/yuzu_cmd/yuzu.cpp')
| -rw-r--r-- | src/yuzu_cmd/yuzu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index 50e388312..9607cdcb1 100644 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp | |||
| @@ -78,7 +78,7 @@ static void InitializeLogging() { | |||
| 78 | using namespace Common; | 78 | using namespace Common; |
| 79 | 79 | ||
| 80 | Log::Filter log_filter(Log::Level::Debug); | 80 | Log::Filter log_filter(Log::Level::Debug); |
| 81 | log_filter.ParseFilterString(Settings::values.log_filter); | 81 | log_filter.ParseFilterString(static_cast<std::string>(Settings::values.log_filter)); |
| 82 | Log::SetGlobalFilter(log_filter); | 82 | Log::SetGlobalFilter(log_filter); |
| 83 | 83 | ||
| 84 | Log::AddBackend(std::make_unique<Log::ColorConsoleBackend>()); | 84 | Log::AddBackend(std::make_unique<Log::ColorConsoleBackend>()); |