From e1b83b6eb474484d5464ebde575b73feb2fb7a40 Mon Sep 17 00:00:00 2001 From: Christopher Leggett Date: Tue, 20 Sep 2022 21:15:15 -0400 Subject: [PATCH] Fixes crash on Switch/WiiU when attempting to show the ImGui menubar. (#1534) * Fixes crash on Switch/WiiU when attempting to show the ImGui menubar. * Fixes weird indentaion on GitHub? --- libultraship/libultraship/Controller.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libultraship/libultraship/Controller.cpp b/libultraship/libultraship/Controller.cpp index ae9d863d1..05ed01e25 100644 --- a/libultraship/libultraship/Controller.cpp +++ b/libultraship/libultraship/Controller.cpp @@ -78,9 +78,11 @@ namespace Ship { padToBuffer.gyro_y = getGyroY(virtualSlot); padBuffer.push_front(padToBuffer); - *pad = padBuffer[std::min(padBuffer.size(), (size_t)CVar_GetS32("gSimulatedInputLag", 0))]; - - while (padBuffer.size() > 6) { + if (pad != nullptr) { + *pad = padBuffer[std::min(padBuffer.size(), (size_t)CVar_GetS32("gSimulatedInputLag", 0))]; + } + + while (padBuffer.size() > 6) { padBuffer.pop_back(); } }