diff options
| -rw-r--r-- | src/yuzu/debugger/console.cpp | 7 | ||||
| -rw-r--r-- | src/yuzu/main.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu_cmd/yuzu.cpp | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/yuzu/debugger/console.cpp b/src/yuzu/debugger/console.cpp index e3d2d975f..320898f6a 100644 --- a/src/yuzu/debugger/console.cpp +++ b/src/yuzu/debugger/console.cpp | |||
| @@ -14,6 +14,13 @@ | |||
| 14 | 14 | ||
| 15 | namespace Debugger { | 15 | namespace Debugger { |
| 16 | void ToggleConsole() { | 16 | void ToggleConsole() { |
| 17 | static bool console_shown = false; | ||
| 18 | if (console_shown == UISettings::values.show_console) { | ||
| 19 | return; | ||
| 20 | } else { | ||
| 21 | console_shown = UISettings::values.show_console; | ||
| 22 | } | ||
| 23 | |||
| 17 | #if defined(_WIN32) && !defined(_DEBUG) | 24 | #if defined(_WIN32) && !defined(_DEBUG) |
| 18 | FILE* temp; | 25 | FILE* temp; |
| 19 | if (UISettings::values.show_console) { | 26 | if (UISettings::values.show_console) { |
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 05a8ae6d2..9ce8d7c27 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -908,8 +908,6 @@ void GMainWindow::UpdateUITheme() { | |||
| 908 | #endif | 908 | #endif |
| 909 | 909 | ||
| 910 | int main(int argc, char* argv[]) { | 910 | int main(int argc, char* argv[]) { |
| 911 | Log::AddBackend(std::make_unique<Log::ColorConsoleBackend>()); | ||
| 912 | |||
| 913 | MicroProfileOnThreadCreate("Frontend"); | 911 | MicroProfileOnThreadCreate("Frontend"); |
| 914 | SCOPE_EXIT({ MicroProfileShutdown(); }); | 912 | SCOPE_EXIT({ MicroProfileShutdown(); }); |
| 915 | 913 | ||
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index 8ddd202d8..5f67ae4ee 100644 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp | |||
| @@ -127,6 +127,7 @@ int main(int argc, char** argv) { | |||
| 127 | #endif | 127 | #endif |
| 128 | 128 | ||
| 129 | Log::Filter log_filter(Log::Level::Debug); | 129 | Log::Filter log_filter(Log::Level::Debug); |
| 130 | log_filter.ParseFilterString(Settings::values.log_filter); | ||
| 130 | Log::SetGlobalFilter(log_filter); | 131 | Log::SetGlobalFilter(log_filter); |
| 131 | 132 | ||
| 132 | Log::AddBackend(std::make_unique<Log::ColorConsoleBackend>()); | 133 | Log::AddBackend(std::make_unique<Log::ColorConsoleBackend>()); |
| @@ -142,8 +143,6 @@ int main(int argc, char** argv) { | |||
| 142 | return -1; | 143 | return -1; |
| 143 | } | 144 | } |
| 144 | 145 | ||
| 145 | log_filter.ParseFilterString(Settings::values.log_filter); | ||
| 146 | |||
| 147 | // Apply the command line arguments | 146 | // Apply the command line arguments |
| 148 | Settings::values.gdbstub_port = gdb_port; | 147 | Settings::values.gdbstub_port = gdb_port; |
| 149 | Settings::values.use_gdbstub = use_gdbstub; | 148 | Settings::values.use_gdbstub = use_gdbstub; |