Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Qt: pad settings: clear input data on thread pause #12739

Merged
merged 1 commit into from Oct 1, 2022
Merged

Qt: pad settings: clear input data on thread pause #12739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 1 addition & 4 deletions rpcs3/Emu/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -37,7 +37,6 @@ target_include_directories(rpcs3_emu
PUBLIC
${RPCS3_SRC_DIR})


# Utilities
target_sources(rpcs3_emu PRIVATE
../util/atomic.cpp
Expand Down Expand Up @@ -117,7 +116,6 @@ target_sources(rpcs3_emu PRIVATE
../Loader/TRP.cpp
)


# Audio
target_sources(rpcs3_emu PRIVATE
Audio/audio_resampler.cpp
Expand Down Expand Up @@ -416,7 +414,6 @@ target_sources(rpcs3_emu PRIVATE
Memory/vm.cpp
)


# RSX
target_sources(rpcs3_emu PRIVATE
RSX/gcm_enums.cpp
Expand Down Expand Up @@ -551,7 +548,7 @@ target_link_libraries(rpcs3_emu
if(APPLE)
check_function_exists(clock_gettime 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()

Expand Down
2 changes: 2 additions & 0 deletions rpcs3/rpcs3qt/pad_settings_dialog.cpp
View file
Open in desktop
Expand Up @@ -512,6 +512,8 @@ void pad_settings_dialog::InitButtons()
{
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;
}

Expand Down