From de6c0defb358b6d12831a594b1b4c615003566b8 Mon Sep 17 00:00:00 2001 From: Liam Date: Fri, 10 Jun 2022 09:11:02 -0400 Subject: core/debugger: support operation in yuzu-cmd --- src/yuzu_cmd/yuzu.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/yuzu_cmd/yuzu.cpp') diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index ab12dd15d..a0d619c48 100644 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp @@ -217,7 +217,15 @@ int main(int argc, char** argv) { [](VideoCore::LoadCallbackStage, size_t value, size_t total) {}); } + system.RegisterExitCallback([&] { + // Just exit right away. + exit(0); + }); + void(system.Run()); + if (system.DebuggerEnabled()) { + system.InitializeDebugger(); + } while (emu_window->IsOpen()) { emu_window->WaitEvent(); } -- cgit v1.2.3 From 1f0fee33edf06bb237a952b78b6e117ba81cbdbb Mon Sep 17 00:00:00 2001 From: Liam Date: Fri, 10 Jun 2022 09:17:12 -0400 Subject: core/debugger: fix a number of shutdown deadlocks --- src/yuzu_cmd/yuzu.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/yuzu_cmd/yuzu.cpp') diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index a0d619c48..0dce5e274 100644 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp @@ -229,6 +229,7 @@ int main(int argc, char** argv) { while (emu_window->IsOpen()) { emu_window->WaitEvent(); } + system.DetachDebugger(); void(system.Pause()); system.Shutdown(); -- cgit v1.2.3