From 399f20ae54d668a1291fce6af5c138b19fd5861f Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sun, 21 Mar 2021 20:33:30 +0100 Subject: [PATCH] Qt: Fix debugger step shortcuts --- rpcs3/rpcs3qt/debugger_frame.cpp | 8 ++++---- rpcs3/rpcs3qt/debugger_frame.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rpcs3/rpcs3qt/debugger_frame.cpp b/rpcs3/rpcs3qt/debugger_frame.cpp index 08d1a2aebc..0c54b6a51f 100644 --- a/rpcs3/rpcs3qt/debugger_frame.cpp +++ b/rpcs3/rpcs3qt/debugger_frame.cpp @@ -268,8 +268,8 @@ void debugger_frame::keyPressEvent(QKeyEvent* event) "\nKey N: Show next instruction the thread will execute after marked instruction, does nothing if target is not predictable." "\nKey M: Show the Memory Viewer with initial address pointing to the marked instruction." "\nKey I: Show RSX method detail." - "\nKey F10: Perform single-stepping on instructions." - "\nKey F11: Perform step-over on instructions. (skip function calls)" + "\nKey F10: Perform step-over on instructions. (skip function calls)" + "\nKey F11: Perform single-stepping on instructions." "\nKey F1: Show this help dialog." "\nKey Up: Scroll one instruction upwards. (address is decremented)" "\nKey Down: Scroll one instruction downwards. (address is incremented)" @@ -892,11 +892,11 @@ void debugger_frame::ShowPC() m_debugger_list->ShowAddress(pc); } -void debugger_frame::DoStep(bool stepOver) +void debugger_frame::DoStep(bool step_over) { if (const auto cpu = get_cpu()) { - bool should_step_over = stepOver && cpu->id_type() == 1; + bool should_step_over = step_over && cpu->id_type() == 1; if (auto _state = +cpu->state; _state & s_pause_flags && _state & cpu_flag::wait && !(_state & cpu_flag::dbg_step)) { diff --git a/rpcs3/rpcs3qt/debugger_frame.h b/rpcs3/rpcs3qt/debugger_frame.h index d6faa0b8e9..c0e8fecca6 100644 --- a/rpcs3/rpcs3qt/debugger_frame.h +++ b/rpcs3/rpcs3qt/debugger_frame.h @@ -105,7 +105,7 @@ Q_SIGNALS: void CallStackUpdateRequested(std::vector> call_stack); public Q_SLOTS: - void DoStep(bool stepOver = false); + void DoStep(bool step_over = false); private Q_SLOTS: void OnSelectUnit();