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_per_game_addons.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_per_game_addons.cpp')
-rw-r--r-- | src/yuzu/configuration/configure_per_game_addons.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/yuzu/configuration/configure_per_game_addons.cpp b/src/yuzu/configuration/configure_per_game_addons.cpp index 7893a85bb..4906997ab 100644 --- a/src/yuzu/configuration/configure_per_game_addons.cpp +++ b/src/yuzu/configuration/configure_per_game_addons.cpp @@ -89,8 +89,8 @@ void ConfigurePerGameAddons::ApplyConfiguration() { Settings::values.disabled_addons[title_id] = disabled_addons; } -void ConfigurePerGameAddons::LoadFromFile(FileSys::VirtualFile file) { - this->file = std::move(file); +void ConfigurePerGameAddons::LoadFromFile(FileSys::VirtualFile file_) { + file = std::move(file_); LoadConfiguration(); } |