diff options
| author |  darkf | 2014-12-29 19:47:41 -0800 |
|---|---|---|
| committer | darkf | 2014-12-29 19:47:41 -0800 |
| commit | 8ba9ac0f74abb0408a26207a76a0c1808bad8de0 (patch) | |
| tree | f1c7c3393fa726435b5b90bf335567c93e528ef1 /src/citra_qt/debugger/disassembler.cpp | |
| parent | Add comment regarding __WIN32__ in SkyEye code (diff) | |
| parent | Merge pull request #367 from bunnei/usat_ssat (diff) | |
| download | yuzu-8ba9ac0f74abb0408a26207a76a0c1808bad8de0.tar.gz yuzu-8ba9ac0f74abb0408a26207a76a0c1808bad8de0.tar.xz yuzu-8ba9ac0f74abb0408a26207a76a0c1808bad8de0.zip | |
Fix merge conflicts
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() | |||
| 220 | emu_thread.SetCpuRunning(false); | 220 | emu_thread.SetCpuRunning(false); |
| 221 | 221 | ||
| 222 | // TODO: By now, the CPU might not have actually stopped... | 222 | // TODO: By now, the CPU might not have actually stopped... |
| 223 | model->SetNextInstruction(Core::g_app_core->GetPC()); | 223 | if (Core::g_app_core) { |
| 224 | model->SetNextInstruction(Core::g_app_core->GetPC()); | ||
| 225 | } | ||
| 224 | } | 226 | } |
| 225 | 227 | ||
| 226 | void DisassemblerWidget::OnToggleStartStop() | 228 | void DisassemblerWidget::OnToggleStartStop() |