summaryrefslogtreecommitdiff
path: root/src/citra_qt/debugger/disassembler.cpp
diff options
context:
space:
mode:
authorGravatar Tony Wasserka2015-01-11 21:28:18 +0100
committerGravatar Tony Wasserka2015-01-11 21:28:18 +0100
commitf1080de47d22bec2b55947718cc7f489bfd0c6ba (patch)
tree35383951c562a1a73b1f8b6a78241cd3259ab727 /src/citra_qt/debugger/disassembler.cpp
parentMerge pull request #465 from chinhodado/appveyor (diff)
parentcitra-qt: Replace OnCpuStepped signal by new signals DebugModeEntered and Deb... (diff)
downloadyuzu-f1080de47d22bec2b55947718cc7f489bfd0c6ba.tar.gz
yuzu-f1080de47d22bec2b55947718cc7f489bfd0c6ba.tar.xz
yuzu-f1080de47d22bec2b55947718cc7f489bfd0c6ba.zip
Merge pull request #437 from Kingcom/DebugMode
Replace OnCpuStepped signal
Diffstat (limited to 'src/citra_qt/debugger/disassembler.cpp')
-rw-r--r--src/citra_qt/debugger/disassembler.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/citra_qt/debugger/disassembler.cpp b/src/citra_qt/debugger/disassembler.cpp
index da084ab24..c61ace925 100644
--- a/src/citra_qt/debugger/disassembler.cpp
+++ b/src/citra_qt/debugger/disassembler.cpp
@@ -235,7 +235,7 @@ void DisassemblerWidget::OnToggleStartStop()
235 emu_thread.SetCpuRunning(!emu_thread.IsCpuRunning()); 235 emu_thread.SetCpuRunning(!emu_thread.IsCpuRunning());
236} 236}
237 237
238void DisassemblerWidget::OnCPUStepped() 238void DisassemblerWidget::OnDebugModeEntered()
239{ 239{
240 ARMword next_instr = Core::g_app_core->GetPC(); 240 ARMword next_instr = Core::g_app_core->GetPC();
241 241
@@ -252,6 +252,11 @@ void DisassemblerWidget::OnCPUStepped()
252 disasm_ui.treeView->selectionModel()->setCurrentIndex(model_index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows); 252 disasm_ui.treeView->selectionModel()->setCurrentIndex(model_index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
253} 253}
254 254
255void DisassemblerWidget::OnDebugModeLeft()
256{
257
258}
259
255int DisassemblerWidget::SelectedRow() 260int DisassemblerWidget::SelectedRow()
256{ 261{
257 QModelIndex index = disasm_ui.treeView->selectionModel()->currentIndex(); 262 QModelIndex index = disasm_ui.treeView->selectionModel()->currentIndex();