Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Qt: Create emu thread on bootup, kill it on shutdown.

Browse source
This commit is contained in:
bunnei 2015-04-16 23:31:14 -04:00
parent d5665fea89
commit 28df8dbfeb
3 changed files with 44 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/citra_qt/main.cpp
View file

@ -57,7 +57,6 @@ GMainWindow::GMainWindow() : emu_thread(nullptr)
render_window = new GRenderWindow(this, *this);
render_window->hide();
emu_thread = new EmuThread(render_window);
profilerWidget = new ProfilerWidget(this);
addDockWidget(Qt::BottomDockWidgetArea, profilerWidget);
@ -197,9 +196,9 @@ void GMainWindow::OnDisplayTitleBars(bool show)
}
}
void GMainWindow::BootGame(std::string filename)
{
void GMainWindow::BootGame(std::string filename) {
LOG_INFO(Frontend, "Citra starting...\n");
System::Init(render_window);
// Load a game or die...
@ -211,6 +210,7 @@ void GMainWindow::BootGame(std::string filename)
registersWidget->OnDebugModeEntered();
callstackWidget->OnDebugModeEntered();
emu_thread = new EmuThread(render_window);
emu_thread->start();
render_window->show();
@ -248,14 +248,22 @@ void GMainWindow::OnPauseGame()
ui.action_Stop->setEnabled(true);
}
void GMainWindow::OnStopGame()
{
void GMainWindow::OnStopGame() {
emu_thread->SetCpuRunning(false);
// TODO: Shutdown core
emu_thread->ShutdownCpu();
emu_thread->WaitForCpuShutdown();
emu_thread->Stop();
delete emu_thread;
System::Shutdown();
ui.action_Start->setEnabled(true);
ui.action_Pause->setEnabled(false);
ui.action_Stop->setEnabled(false);
render_window->hide();
}
void GMainWindow::OnOpenHotkeysDialog()