hipnosuer
/
Zuma
forked from ShuriZma/suyu
1
0
Fork 0
Code Pull Requests Activity

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
parent 9a403d7dfb e6162ed91e
commit 5763d40319
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/citra_qt/debugger/disassembler.cpp
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...
model->SetNextInstruction(Core::g_app_core->GetPC()); if (Core::g_app_core) {
model->SetNextInstruction(Core::g_app_core->GetPC());
}
} }
void DisassemblerWidget::OnToggleStartStop() void DisassemblerWidget::OnToggleStartStop()