summaryrefslogtreecommitdiff
path: root/src/citra_qt/debugger/disassembler.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2015-04-28 19:03:01 -0400
committerGravatar bunnei2015-05-01 18:27:07 -0400
commite4ea133717a5292339c134160da984ba186d3de8 (patch)
treef6c3e289eaee3c79375d136279509523d4b3aca8 /src/citra_qt/debugger/disassembler.cpp
parentQt: Fix loading a new game without stopping emulation. (diff)
downloadyuzu-e4ea133717a5292339c134160da984ba186d3de8.tar.gz
yuzu-e4ea133717a5292339c134160da984ba186d3de8.tar.xz
yuzu-e4ea133717a5292339c134160da984ba186d3de8.zip
Qt: Restructured to remove unnecessary shutdown event and various cleanups.
Diffstat (limited to 'src/citra_qt/debugger/disassembler.cpp')
-rw-r--r--src/citra_qt/debugger/disassembler.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/citra_qt/debugger/disassembler.cpp b/src/citra_qt/debugger/disassembler.cpp
index b58edafe7..f9423e1d6 100644
--- a/src/citra_qt/debugger/disassembler.cpp
+++ b/src/citra_qt/debugger/disassembler.cpp
@@ -201,7 +201,7 @@ void DisassemblerWidget::Init()
201 201
202void DisassemblerWidget::OnContinue() 202void DisassemblerWidget::OnContinue()
203{ 203{
204 main_window.GetEmuThread()->SetCpuRunning(true); 204 main_window.GetEmuThread()->SetRunning(true);
205} 205}
206 206
207void DisassemblerWidget::OnStep() 207void DisassemblerWidget::OnStep()
@@ -211,13 +211,13 @@ void DisassemblerWidget::OnStep()
211 211
212void DisassemblerWidget::OnStepInto() 212void DisassemblerWidget::OnStepInto()
213{ 213{
214 main_window.GetEmuThread()->SetCpuRunning(false); 214 main_window.GetEmuThread()->SetRunning(false);
215 main_window.GetEmuThread()->ExecStep(); 215 main_window.GetEmuThread()->ExecStep();
216} 216}
217 217
218void DisassemblerWidget::OnPause() 218void DisassemblerWidget::OnPause()
219{ 219{
220 main_window.GetEmuThread()->SetCpuRunning(false); 220 main_window.GetEmuThread()->SetRunning(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 if (Core::g_app_core) { 223 if (Core::g_app_core) {
@@ -227,7 +227,7 @@ void DisassemblerWidget::OnPause()
227 227
228void DisassemblerWidget::OnToggleStartStop() 228void DisassemblerWidget::OnToggleStartStop()
229{ 229{
230 main_window.GetEmuThread()->SetCpuRunning(!main_window.GetEmuThread()->IsCpuRunning()); 230 main_window.GetEmuThread()->SetRunning(!main_window.GetEmuThread()->IsRunning());
231} 231}
232 232
233void DisassemblerWidget::OnDebugModeEntered() 233void DisassemblerWidget::OnDebugModeEntered()
@@ -235,7 +235,7 @@ void DisassemblerWidget::OnDebugModeEntered()
235 ARMword next_instr = Core::g_app_core->GetPC(); 235 ARMword next_instr = Core::g_app_core->GetPC();
236 236
237 if (model->GetBreakPoints().IsAddressBreakPoint(next_instr)) 237 if (model->GetBreakPoints().IsAddressBreakPoint(next_instr))
238 main_window.GetEmuThread()->SetCpuRunning(false); 238 main_window.GetEmuThread()->SetRunning(false);
239 239
240 model->SetNextInstruction(next_instr); 240 model->SetNextInstruction(next_instr);
241 241