summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorxdec <xdec.dev@gmail.com>2014-12-28 10:56:07 +0100
committerxdec <xdec.dev@gmail.com>2014-12-28 10:56:07 +0100
commit8de09d87ab529f6f9525b784de4343b7aa4d6bf9 (patch)
tree2f4938c91d235f4313b7d74028125bab04b6e107 /src
parentMerge pull request #350 from lioncash/qops (diff)
downloadyuzu-8de09d87ab529f6f9525b784de4343b7aa4d6bf9.tar
yuzu-8de09d87ab529f6f9525b784de4343b7aa4d6bf9.tar.gz
yuzu-8de09d87ab529f6f9525b784de4343b7aa4d6bf9.tar.bz2
yuzu-8de09d87ab529f6f9525b784de4343b7aa4d6bf9.tar.lz
yuzu-8de09d87ab529f6f9525b784de4343b7aa4d6bf9.tar.xz
yuzu-8de09d87ab529f6f9525b784de4343b7aa4d6bf9.tar.zst
yuzu-8de09d87ab529f6f9525b784de4343b7aa4d6bf9.zip
Diffstat (limited to 'src')
-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 2ee877743..159f4d65e 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()