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.

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

input: Fix crash when closing add controller dialog before search completes #1386

Merged
merged 5 commits into from
Oct 28, 2024

Conversation

goeiecool9999
Copy link
Collaborator

Fixes: #869

struct AsyncThreadData
{
std::atomic_bool discardResult = false;
std::mutex mutex;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion: Make the mutex a member variable of InputAPIAddWindow. Tracking it per-thread only unnecessarily complicates things and is error prone.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, this may then introduce a race condition where this is destroyed before the thread accesses it. Not sure, maybe there is a less fragile way to handle this in general.

Copy link
Collaborator Author

@goeiecool9999 goeiecool9999 Oct 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe there is a less fragile way to handle this in general.

Have a look at the latest commit. I switched to a jthread. I think I was reinventing the wheel.
EDIT: I just remembered that Apple Clang doesn't support std::jthread 😢

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've reverted it. Not only because of the lack of macOS support but also because it has more theoretical race conditions than the mutex.

src/gui/input/InputAPIAddWindow.cpp Outdated Show resolved Hide resolved
src/gui/input/InputAPIAddWindow.cpp Outdated Show resolved Hide resolved
@Exzap Exzap merged commit 459fd5d into cemu-project:main Oct 28, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

DSUController settings crash Cemu
2 participants