From 810b86f451697b6069688bf54514a8c6226ba4cd Mon Sep 17 00:00:00 2001 From: wwylele Date: Sat, 30 Jun 2018 13:07:30 +0300 Subject: [PATCH 1/3] citra_qt: only toggle console if the setting has been changed --- src/citra_qt/debugger/console.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/citra_qt/debugger/console.cpp b/src/citra_qt/debugger/console.cpp index f405f8172..f3d126f35 100644 --- a/src/citra_qt/debugger/console.cpp +++ b/src/citra_qt/debugger/console.cpp @@ -14,6 +14,16 @@ namespace Debugger { void ToggleConsole() { + static bool first_call = true, console_shown = true; + if (!first_call) { + if (console_shown == UISettings::values.show_console) { + return; + } else { + console_shown = UISettings::values.show_console; + } + } else { + first_call = false; + } #ifdef _WIN32 FILE* temp; if (UISettings::values.show_console) { From 4be2f12914ef69af68f0f1926bbb9cf1226d71bc Mon Sep 17 00:00:00 2001 From: Weiyi Wang Date: Mon, 2 Jul 2018 19:39:13 +0300 Subject: [PATCH 2/3] log/console: no need to test first call Just let `console_shown` be initialized to the default status (console isn't shown on startup) --- src/citra_qt/debugger/console.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/citra_qt/debugger/console.cpp b/src/citra_qt/debugger/console.cpp index f3d126f35..e741f45e8 100644 --- a/src/citra_qt/debugger/console.cpp +++ b/src/citra_qt/debugger/console.cpp @@ -14,16 +14,13 @@ namespace Debugger { void ToggleConsole() { - static bool first_call = true, console_shown = true; - if (!first_call) { - if (console_shown == UISettings::values.show_console) { - return; - } else { - console_shown = UISettings::values.show_console; - } + static bool console_shown = false; + if (console_shown == UISettings::values.show_console) { + return; } else { - first_call = false; + console_shown = UISettings::values.show_console; } + #ifdef _WIN32 FILE* temp; if (UISettings::values.show_console) { From a9f8887c9369f6cf11cecf5d777a4504980783db Mon Sep 17 00:00:00 2001 From: Weiyi Wang Date: Mon, 2 Jul 2018 19:47:41 +0300 Subject: [PATCH 3/3] remove trailing space --- src/citra_qt/debugger/console.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/citra_qt/debugger/console.cpp b/src/citra_qt/debugger/console.cpp index e741f45e8..3d6b9ca41 100644 --- a/src/citra_qt/debugger/console.cpp +++ b/src/citra_qt/debugger/console.cpp @@ -20,7 +20,7 @@ void ToggleConsole() { } else { console_shown = UISettings::values.show_console; } - + #ifdef _WIN32 FILE* temp; if (UISettings::values.show_console) {