diff options
author | bunnei <bunneidev@gmail.com> | 2020-12-08 17:43:59 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-08 17:43:59 -0800 |
commit | 05a703e15d37265523b7f804e066a80ba14f0096 (patch) | |
tree | 8c388c1e0e575c375bb61fcb355186b98745f805 /src/yuzu/applets/controller.cpp | |
parent | aeb100cffe2495d35f4d38d4212e7a101b0d600f (diff) | |
parent | f6d4a289d53516789ceb5f90f086ffe8b2822115 (diff) |
Merge pull request #5135 from Morph1984/applets-shadow
applets: Resolve variable shadowing
Diffstat (limited to 'src/yuzu/applets/controller.cpp')
-rw-r--r-- | src/yuzu/applets/controller.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/yuzu/applets/controller.cpp b/src/yuzu/applets/controller.cpp index 6944478f3..a15e8ca2a 100644 --- a/src/yuzu/applets/controller.cpp +++ b/src/yuzu/applets/controller.cpp @@ -660,8 +660,8 @@ QtControllerSelector::QtControllerSelector(GMainWindow& parent) { QtControllerSelector::~QtControllerSelector() = default; void QtControllerSelector::ReconfigureControllers( - std::function<void()> callback, const Core::Frontend::ControllerParameters& parameters) const { - this->callback = std::move(callback); + std::function<void()> callback_, const Core::Frontend::ControllerParameters& parameters) const { + callback = std::move(callback_); emit MainWindowReconfigureControllers(parameters); } |