summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-07-12 15:42:46 +0200
committerGitHub <noreply@github.com>2018-07-12 15:42:46 +0200
commitb89fb430c7e262342a77a3c1fbb7d754630387cd (patch)
tree4e9143094f7addbca8d3ce4c7bcded111748280e
parentMerge pull request #559 from Subv/mount_savedata (diff)
parentyuzu - Fix duplicate logs (diff)
downloadyuzu-b89fb430c7e262342a77a3c1fbb7d754630387cd.tar
yuzu-b89fb430c7e262342a77a3c1fbb7d754630387cd.tar.gz
yuzu-b89fb430c7e262342a77a3c1fbb7d754630387cd.tar.bz2
yuzu-b89fb430c7e262342a77a3c1fbb7d754630387cd.tar.lz
yuzu-b89fb430c7e262342a77a3c1fbb7d754630387cd.tar.xz
yuzu-b89fb430c7e262342a77a3c1fbb7d754630387cd.tar.zst
yuzu-b89fb430c7e262342a77a3c1fbb7d754630387cd.zip
-rw-r--r--src/yuzu/debugger/console.cpp7
-rw-r--r--src/yuzu/main.cpp2
-rw-r--r--src/yuzu_cmd/yuzu.cpp3
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 @@
namespace Debugger {
void ToggleConsole() {
+ static bool console_shown = false;
+ if (console_shown == UISettings::values.show_console) {
+ return;
+ } else {
+ console_shown = UISettings::values.show_console;
+ }
+
#if defined(_WIN32) && !defined(_DEBUG)
FILE* temp;
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() {
#endif
int main(int argc, char* argv[]) {
- Log::AddBackend(std::make_unique<Log::ColorConsoleBackend>());
-
MicroProfileOnThreadCreate("Frontend");
SCOPE_EXIT({ MicroProfileShutdown(); });
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) {
#endif
Log::Filter log_filter(Log::Level::Debug);
+ log_filter.ParseFilterString(Settings::values.log_filter);
Log::SetGlobalFilter(log_filter);
Log::AddBackend(std::make_unique<Log::ColorConsoleBackend>());
@@ -142,8 +143,6 @@ int main(int argc, char** argv) {
return -1;
}
- log_filter.ParseFilterString(Settings::values.log_filter);
-
// Apply the command line arguments
Settings::values.gdbstub_port = gdb_port;
Settings::values.use_gdbstub = use_gdbstub;