diff options
| author | bunnei <bunneidev@gmail.com> | 2014-12-28 22:00:47 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-12-28 22:00:47 -0500 |
| commit | 5763d40319139aefd28ebfa387bbe56408664ce5 (patch) | |
| tree | aa067df603c9fc3117b1d30591e51330faf75ba1 /src/citra_qt/debugger/disassembler.cpp | |
| parent | 9a403d7dfb640cbb0dbc6b10583d2e4b430b099d (diff) | |
| parent | e6162ed91e29c356af1007f9b9545d4d076570c9 (diff) | |
Merge pull request #352 from xdec/PR_XDEC_172
Qt: Citra crashes if disassembler pause button is pressed while no game is running. #172
Diffstat (limited to 'src/citra_qt/debugger/disassembler.cpp')
| -rw-r--r-- | src/citra_qt/debugger/disassembler.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/citra_qt/debugger/disassembler.cpp b/src/citra_qt/debugger/disassembler.cpp index 2ee877743..14745f3bb 100644 --- a/src/citra_qt/debugger/disassembler.cpp +++ b/src/citra_qt/debugger/disassembler.cpp @@ -220,7 +220,9 @@ void DisassemblerWidget::OnPause() emu_thread.SetCpuRunning(false); // 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() |