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_cmd/emu_window/emu_window_sdl2_vk.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_cmd/emu_window/emu_window_sdl2_vk.cpp')
| -rw-r--r-- | src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp index d5fe35aa0..65455c86e 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp @@ -21,9 +21,9 @@ #include <SDL.h> #include <SDL_syswm.h> -EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(InputCommon::InputSubsystem* input_subsystem, +EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(InputCommon::InputSubsystem* input_subsystem_, Core::System& system_, bool fullscreen) - : EmuWindow_SDL2{input_subsystem, system_} { + : EmuWindow_SDL2{input_subsystem_, system_} { const std::string window_title = fmt::format("yuzu {} | {}-{} (Vulkan)", Common::g_build_name, Common::g_scm_branch, Common::g_scm_desc); render_window = |