ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: pad settings: clear input data on thread pause 

Fixes incorrectly disabled buttons when changing from a handler with a disconnected pad to any other handler
This commit is contained in:
Megamouse 2022-10-01 12:47:27 +02:00
parent eff1e4bd7e
commit 7d32dc312f
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rpcs3/Emu/CMakeLists.txt
View File

@ -37,7 +37,6 @@ target_include_directories(rpcs3_emu
PUBLIC PUBLIC
${RPCS3_SRC_DIR}) ${RPCS3_SRC_DIR})
# Utilities # Utilities
target_sources(rpcs3_emu PRIVATE target_sources(rpcs3_emu PRIVATE
../util/atomic.cpp ../util/atomic.cpp
@ -117,7 +116,6 @@ target_sources(rpcs3_emu PRIVATE
../Loader/TRP.cpp ../Loader/TRP.cpp
) )
# Audio # Audio
target_sources(rpcs3_emu PRIVATE target_sources(rpcs3_emu PRIVATE
Audio/audio_resampler.cpp Audio/audio_resampler.cpp
@ -416,7 +414,6 @@ target_sources(rpcs3_emu PRIVATE
Memory/vm.cpp Memory/vm.cpp
) )
# RSX # RSX
target_sources(rpcs3_emu PRIVATE target_sources(rpcs3_emu PRIVATE
RSX/gcm_enums.cpp RSX/gcm_enums.cpp
@ -551,7 +548,7 @@ target_link_libraries(rpcs3_emu
if(APPLE) if(APPLE)
check_function_exists(clock_gettime HAVE_CLOCK_GETTIME) check_function_exists(clock_gettime HAVE_CLOCK_GETTIME)
if (${HAVE_CLOCK_GETTIME}) if (${HAVE_CLOCK_GETTIME})
target_compile_definitions(rpcs3_emu PUBLIC -DHAVE_CLOCK_GETTIME) target_compile_definitions(rpcs3_emu PUBLIC -DHAVE_CLOCK_GETTIME)
endif() endif()
endif() endif()

2
rpcs3/rpcs3qt/pad_settings_dialog.cpp
View File

@ -512,6 +512,8 @@ void pad_settings_dialog::InitButtons()
{ {
if (m_input_thread_state == input_thread_state::pausing) if (m_input_thread_state == input_thread_state::pausing)
{ {
std::lock_guard lock(m_input_mutex);
m_input_callback_data = {};
m_input_thread_state = input_thread_state::paused; m_input_thread_state = input_thread_state::paused;
} }