From 6a671554041917453e5c285f0a195b2e44d2a07d Mon Sep 17 00:00:00 2001 From: Megamouse Date: Thu, 21 Apr 2022 23:43:39 +0200 Subject: [PATCH] Qt: fix access to uninitialized Pad object Fixes a crash when opening the pad settings before the pad handlers are initialized. --- rpcs3/rpcs3qt/pad_settings_dialog.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.cpp b/rpcs3/rpcs3qt/pad_settings_dialog.cpp index 99054ca5a1..fd9624c54a 100644 --- a/rpcs3/rpcs3qt/pad_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/pad_settings_dialog.cpp @@ -1694,7 +1694,12 @@ bool pad_settings_dialog::GetIsLddPad(u32 index) const std::lock_guard lock(pad::g_pad_mutex); if (const auto handler = pad::get_current_handler(true)) { - return handler->GetPads().at(index)->ldd; + ensure(index < handler->GetPads().size()); + + if (const std::shared_ptr pad = handler->GetPads().at(index)) + { + return pad->ldd; + } } }