diff options
| author | Mai <mathew1800@gmail.com> | 2022-06-14 21:08:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-14 21:08:58 -0400 |
| commit | 103997ee56ebec3f417e93ed42e3047d8005125b (patch) | |
| tree | 18b81c112665f830371408599ae157fc83936a70 /src/yuzu/configuration/configure_ringcon.cpp | |
| parent | c9de5474bfb7543a01337b73c33c4bf3b76e276e (diff) | |
| parent | 7620e1a631781b234b17cbbf7c5f7bd14d3115f9 (diff) | |
Merge pull request #8383 from Morph1984/shadow-of-the-past
yuzu: Make variable shadowing a compile-time error
Diffstat (limited to 'src/yuzu/configuration/configure_ringcon.cpp')
| -rw-r--r-- | src/yuzu/configuration/configure_ringcon.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/yuzu/configuration/configure_ringcon.cpp b/src/yuzu/configuration/configure_ringcon.cpp index 4fcc22b7a..688c2dd38 100644 --- a/src/yuzu/configuration/configure_ringcon.cpp +++ b/src/yuzu/configuration/configure_ringcon.cpp @@ -165,10 +165,10 @@ ConfigureRingController::ConfigureRingController(QWidget* parent, const std::string invert_str = invert_value ? "+" : "-"; param.Set("invert_x", invert_str); emulated_device->SetRingParam(param); - for (int sub_button_id = 0; sub_button_id < ANALOG_SUB_BUTTONS_NUM; - ++sub_button_id) { - analog_map_buttons[sub_button_id]->setText( - AnalogToText(param, analog_sub_buttons[sub_button_id])); + for (int sub_button_id2 = 0; sub_button_id2 < ANALOG_SUB_BUTTONS_NUM; + ++sub_button_id2) { + analog_map_buttons[sub_button_id2]->setText( + AnalogToText(param, analog_sub_buttons[sub_button_id2])); } }); context_menu.exec( |