diff --git a/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp index 39b989d141..a31384aee4 100644 --- a/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp +++ b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp @@ -1049,10 +1049,10 @@ NetPlayDialog::FindGameFile(const NetPlay::SyncIdentifier& sync_identifier, RunOnObject(this, [this, &sync_identifier, found] { for (int i = 0; i < m_game_list_model.rowCount(QModelIndex()); i++) { - auto game_file = m_game_list_model.GetGameFile(i); - *found = std::min(*found, game_file->CompareSyncIdentifier(sync_identifier)); + auto file = m_game_list_model.GetGameFile(i); + *found = std::min(*found, file->CompareSyncIdentifier(sync_identifier)); if (*found == NetPlay::SyncIdentifierComparison::SameGame) - return game_file; + return file; } return static_cast>(nullptr); }); diff --git a/Source/Core/InputCommon/ImageOperations.h b/Source/Core/InputCommon/ImageOperations.h index 28d3859ff5..87a4b37d6d 100644 --- a/Source/Core/InputCommon/ImageOperations.h +++ b/Source/Core/InputCommon/ImageOperations.h @@ -32,13 +32,13 @@ struct ImagePixelData { ImagePixelData() = default; - explicit ImagePixelData(std::vector image_pixels, u32 width, u32 height) - : pixels(std::move(image_pixels)), width(width), height(height) + explicit ImagePixelData(std::vector image_pixels, u32 width_, u32 height_) + : pixels(std::move(image_pixels)), width(width_), height(height_) { } - explicit ImagePixelData(u32 width, u32 height, const Pixel& default_color = Pixel{0, 0, 0, 0}) - : pixels(width * height, default_color), width(width), height(height) + explicit ImagePixelData(u32 width_, u32 height_, const Pixel& default_color = Pixel{0, 0, 0, 0}) + : pixels(width_ * height_, default_color), width(width_), height(height_) { } std::vector pixels;