hdkv
/
yuzu
1
Fork 0
Code Issues Pull Requests Releases 1 Activity

early-access version 3212

main
pineappleEA 2022-12-13 23:13:35 +01:00
parent 2e78a58bea
commit 9e8629b298
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,7 +1,7 @@
yuzu emulator early access yuzu emulator early access
============= =============
This is the source code for early-access 3211. This is the source code for early-access 3212.
## Legal Notice ## Legal Notice

5
src/yuzu/bootmanager.cpp
View File

@ -80,6 +80,11 @@ void EmuThread::run() {
system.GetCpuManager().OnGpuReady(); system.GetCpuManager().OnGpuReady();
system.RegisterExitCallback([this]() {
stop_source.request_stop();
SetRunning(false);
});
// Holds whether the cpu was running during the last iteration, // Holds whether the cpu was running during the last iteration,
// so that the DebugModeLeft signal can be emitted before the // so that the DebugModeLeft signal can be emitted before the
// next execution step // next execution step

5
src/yuzu/bootmanager.h
View File

@ -84,9 +84,10 @@ public:
} }
/** /**
* Requests for the emulation thread to stop running * Requests for the emulation thread to immediately stop running
*/ */
void RequestStop() { void ForceStop() {
LOG_WARNING(Frontend, "Force stopping EmuThread");
stop_source.request_stop(); stop_source.request_stop();
SetRunning(false); SetRunning(false);
} }

11
src/yuzu/main.cpp
View File

@ -1706,9 +1706,6 @@ void GMainWindow::BootGame(const QString& filename, u64 program_id, std::size_t
system->RegisterExecuteProgramCallback( system->RegisterExecuteProgramCallback(
[this](std::size_t program_index_) { render_window->ExecuteProgram(program_index_); }); [this](std::size_t program_index_) { render_window->ExecuteProgram(program_index_); });
// Register an Exit callback such that Core can exit the currently running application.
system->RegisterExitCallback([this]() { render_window->Exit(); });
connect(render_window, &GRenderWindow::Closed, this, &GMainWindow::OnStopGame); connect(render_window, &GRenderWindow::Closed, this, &GMainWindow::OnStopGame);
connect(render_window, &GRenderWindow::MouseActivity, this, &GMainWindow::OnMouseActivity); connect(render_window, &GRenderWindow::MouseActivity, this, &GMainWindow::OnMouseActivity);
// BlockingQueuedConnection is important here, it makes sure we've finished refreshing our views // BlockingQueuedConnection is important here, it makes sure we've finished refreshing our views
@ -1795,12 +1792,16 @@ void GMainWindow::ShutdownGame() {
system->SetShuttingDown(true); system->SetShuttingDown(true);
system->DetachDebugger(); system->DetachDebugger();
discord_rpc->Pause(); discord_rpc->Pause();
emu_thread->RequestStop();
RequestGameExit();
emit EmulationStopping(); emit EmulationStopping();
// Wait for emulation thread to complete and delete it // Wait for emulation thread to complete and delete it
emu_thread->wait(); if (!emu_thread->wait(5000)) {
emu_thread->ForceStop();
emu_thread->wait();
}
emu_thread = nullptr; emu_thread = nullptr;
emulation_running = false; emulation_running = false;