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

Fix possible deadlock during log setup #10905

Merged
merged 1 commit into from Jun 2, 2023
Merged

Fix possible deadlock during log setup #10905

merged 1 commit into from Jun 2, 2023

Conversation

TheOneRing
Copy link
Member

@TheOneRing TheOneRing commented Jun 1, 2023 •
edited

This mainly affects

client/src/libsync/logger.cpp

Line 153 in e6d0be9

(*_logstream) << Theme::instance()->aboutVersions(Theme::VersionFormat::OneLiner) << " " << qApp->applicationName() << Qt::endl;
which tries to load our plugins and qt plugins.

@TheOneRing
Fix possible deadlock during log setup
e6d0be9 
The mutex is supposed to ensure the order of messages if threads are involved,
allow multiple locks from the same thread.
@TheOneRing TheOneRing requested a review from a team June 1, 2023 11:15
@fmoc fmoc merged commit dd060c9 into master Jun 2, 2023
6 checks passed
@delete-merged-branch delete-merged-branch bot deleted the work/deadlock branch June 2, 2023 12:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fmoc fmoc fmoc approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@TheOneRing @fmoc