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

Fix crash when using ALSA MIDI with PulseAudio #48350

Merged
merged 1 commit into from
Jun 3, 2021

Conversation

RandomShaper
Copy link
Member

The bug is due to symbols from ALSA library being null if the main audio driver is PulseAudio.

Since @hpvb worked on dynamic library loading and is more Linux-savvy than me, I'm asking him for review.

I'm not sure if this patch needs a version for 4.0.

Fixes #46183.

@akien-mga
Copy link
Member

I'm not sure if this patch needs a version for 4.0.

I guess it might be relevant yes, this code didn't change much in master.

@RandomShaper RandomShaper requested review from a team as code owners June 3, 2021 08:10
@RandomShaper RandomShaper changed the base branch from 3.x to master June 3, 2021 08:11
@RandomShaper RandomShaper changed the title Fix crash when using ALSA MIDI with PulseAudio (3.x) Fix crash when using ALSA MIDI with PulseAudio Jun 3, 2021
@RandomShaper RandomShaper removed request for a team June 3, 2021 08:11
@RandomShaper RandomShaper removed request for a team June 3, 2021 08:11
@RandomShaper RandomShaper added the cherrypick:3.x Considered for cherry-picking into a future 3.x release label Jun 3, 2021
@RandomShaper
Copy link
Member Author

I've rebased the commit against master and retargeted the PR. It seems the code is indeed so similar that cherry-picking is trivial.

(Sorry for the mess just after the re-push. Everything should be tidy again.)

@RandomShaper RandomShaper modified the milestones: 3.4, 4.0 Jun 3, 2021
Copy link
Member

@akien-mga akien-mga left a comment

Choose a reason for hiding this comment

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

@hpvb approved on RC.

@akien-mga akien-mga merged commit 8c23236 into godotengine:master Jun 3, 2021
@akien-mga
Copy link
Member

Thanks!

@akien-mga
Copy link
Member

Cherry-picked for 3.4.

@akien-mga akien-mga removed the cherrypick:3.x Considered for cherry-picking into a future 3.x release label Jun 3, 2021
@RandomShaper RandomShaper deleted the fix_alsamidi_crash branch June 3, 2021 09:06
@akien-mga
Copy link
Member

Cherry-picked for 3.3.3.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Executing OS.open_midi_inputs() crashes Godot
2 participants