diff --git a/rpcs3/Emu/Cell/lv2/sys_uart.cpp b/rpcs3/Emu/Cell/lv2/sys_uart.cpp index b17b98d239..98e3d4b8f8 100644 --- a/rpcs3/Emu/Cell/lv2/sys_uart.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_uart.cpp @@ -49,7 +49,7 @@ struct av_get_monitor_info_cmd : public ps3av_cmd evnt->color.red_x = 0xFFFF; evnt->color.red_y = 0xFFFF; evnt->color.white_x = 0xFFFF; - evnt->color.white_x = 0xFFFF; + evnt->color.white_y = 0xFFFF; evnt->color.gamma = 100; evnt->supported_ai = 0; diff --git a/rpcs3/Input/pad_thread.cpp b/rpcs3/Input/pad_thread.cpp index 7a2c2cd74a..a58b57e16b 100644 --- a/rpcs3/Input/pad_thread.cpp +++ b/rpcs3/Input/pad_thread.cpp @@ -185,7 +185,7 @@ void pad_thread::Init() void pad_thread::SetRumble(const u32 pad, u8 largeMotor, bool smallMotor) { - if (pad > m_pads.size()) + if (pad >= m_pads.size()) return; if (m_pads[pad]->m_vibrateMotors.size() >= 2) diff --git a/rpcs3/rpcs3qt/emu_settings.cpp b/rpcs3/rpcs3qt/emu_settings.cpp index fc2c614276..36dc172d72 100644 --- a/rpcs3/rpcs3qt/emu_settings.cpp +++ b/rpcs3/rpcs3qt/emu_settings.cpp @@ -72,11 +72,6 @@ bool emu_settings::Init() { m_render_creator = new render_creator(this); - if (!m_render_creator) - { - fmt::throw_exception("emu_settings::emu_settings() render_creator is null"); - } - if (m_render_creator->abort_requested) { return false; diff --git a/rpcs3/rpcs3qt/movie_item.h b/rpcs3/rpcs3qt/movie_item.h index 9a2f31f14c..83a79d2a5d 100644 --- a/rpcs3/rpcs3qt/movie_item.h +++ b/rpcs3/rpcs3qt/movie_item.h @@ -53,7 +53,7 @@ public: { if (path.isEmpty() || !m_icon_callback) return; - if (QMovie* movie = new QMovie(path); movie && movie->isValid()) + if (QMovie* movie = new QMovie(path); movie->isValid()) { m_movie = movie; } diff --git a/rpcs3/rpcs3qt/rsx_debugger.cpp b/rpcs3/rpcs3qt/rsx_debugger.cpp index f946171f90..e5aaa127d7 100644 --- a/rpcs3/rpcs3qt/rsx_debugger.cpp +++ b/rpcs3/rpcs3qt/rsx_debugger.cpp @@ -374,11 +374,17 @@ namespace */ u8* convert_to_QImage_buffer(rsx::surface_color_format format, std::span orig_buffer, usz width, usz height) noexcept { - u8* buffer = static_cast(std::malloc(width * height * 4)); - if (!buffer || width == 0 || height == 0) + if (width == 0 || height == 0) { return nullptr; } + + u8* buffer = static_cast(std::malloc(width * height * 4)); + if (!buffer) + { + return nullptr; + } + for (u32 i = 0; i < width * height; i++) { // depending on original buffer, the colors may need to be reversed