mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-12-10 05:38:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

controller select crash fix + minor changes (#3355)

Browse Source 
* fix crash and ingame controller check

* performance issue fix

* add change controller event to imgui
This commit is contained in:
rainmakerv2
2025-07-31 14:12:06 +08:00
committed by GitHub
parent ecc924791d
commit 1b195c9613
4 changed files with 73 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/imgui/renderer/imgui_impl_sdl3.cpp
View File

@@ -9,6 +9,7 @@
#include "core/memory.h"
#include "imgui_impl_sdl3.h"
#include "input/controller.h"
#include "sdl_window.h"
// SDL
#include <SDL3/SDL.h>
@@ -502,6 +503,9 @@ bool ProcessEvent(const SDL_Event* event) {
bd->want_update_gamepads_list = true;
return true;
}
case SDL_EVENT_CHANGE_CONTROLLER:
bd->want_update_gamepads_list = true;
return false;
}
return false;
}
@@ -732,18 +736,15 @@ static void UpdateGamepads() {
ImGuiIO& io = ImGui::GetIO();
SdlData* bd = GetBackendData();
auto memory = Core::Memory::Instance();
auto controller = Common::Singleton<Input::GameController>::Instance();
auto engine = controller->GetEngine();
SDL_Gamepad* SDLGamepad = engine->m_gamepad;
if (SDLGamepad) {
bd->gamepads.push_back(SDLGamepad);
bd->want_update_gamepads_list = false;
} else {
// Update list of gamepads to use
if (bd->want_update_gamepads_list &&
bd->gamepad_mode != ImGui_ImplSDL3_GamepadMode_Manual) {
// Update list of gamepads to use
if (bd->want_update_gamepads_list && bd->gamepad_mode != ImGui_ImplSDL3_GamepadMode_Manual) {
if (SDLGamepad) {
bd->gamepads.push_back(SDLGamepad);
bd->want_update_gamepads_list = false;
} else {
CloseGamepads();
int sdl_gamepads_count = 0;
const SDL_JoystickID* sdl_gamepads = SDL_GetGamepads(&sdl_gamepads_count);