Merge pull request #352 from xdec/PR_XDEC_172

Qt: Citra crashes if disassembler pause button is pressed while no game is running. #172
This commit is contained in:
bunnei 2014-12-28 22:00:47 -05:00
commit 5763d40319

View file

@ -220,7 +220,9 @@ void DisassemblerWidget::OnPause()
emu_thread.SetCpuRunning(false); emu_thread.SetCpuRunning(false);
// TODO: By now, the CPU might not have actually stopped... // TODO: By now, the CPU might not have actually stopped...
if (Core::g_app_core) {
model->SetNextInstruction(Core::g_app_core->GetPC()); model->SetNextInstruction(Core::g_app_core->GetPC());
}
} }
void DisassemblerWidget::OnToggleStartStop() void DisassemblerWidget::OnToggleStartStop()