aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/citra_qt/debugger/disassembler.cpp
diff options
context:
space:
mode:
authorGravatar xdec <xdec.dev@gmail.com>2014-12-28 01:56:07 -0800
committerGravatar xdec <xdec.dev@gmail.com>2014-12-28 01:56:07 -0800
commit8de09d87ab529f6f9525b784de4343b7aa4d6bf9 (patch)
tree2f4938c91d235f4313b7d74028125bab04b6e107 /src/citra_qt/debugger/disassembler.cpp
parent3422d81f053578e2a6806dc9ffa33c50f2c0b66d (diff)
Fix crash when the disassembler pause button is pressed while no game is running.
Diffstat (limited to 'src/citra_qt/debugger/disassembler.cpp')
-rw-r--r--src/citra_qt/debugger/disassembler.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/citra_qt/debugger/disassembler.cpp b/src/citra_qt/debugger/disassembler.cpp
index 2ee87774..159f4d65 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 (model && Core::g_app_core) {
+ model->SetNextInstruction(Core::g_app_core->GetPC());
+ }
}
void DisassemblerWidget::OnToggleStartStop()