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

Workaround for SDL race condition #5815

Merged
merged 2 commits into from Dec 27, 2020
Merged

Conversation

M374LX
Copy link
Contributor

@M374LX M374LX commented Nov 30, 2020

Workaround for #5809.

@LmmsBot
Copy link

LmmsBot commented Nov 30, 2020

🤖 Hey, I'm @LmmsBot from github.com/lmms/bot and I made downloads for this pull request, click me to make them magically appear! 🎩

Linux

Windows

🤖
{"platform_name_to_artifacts": {"Linux": [{"artifact": {"title": {"title": "(AppImage)", "platform_name": "Linux"}, "link": {"link": "https://11225-15778896-gh.circle-artifacts.com/0/lmms-1.3.0-alpha.1.36%2Bg05eeec4-linux-x86_64.AppImage"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/11225?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}], "Windows": [{"artifact": {"title": {"title": "32-bit", "platform_name": "Windows"}, "link": {"link": "https://11226-15778896-gh.circle-artifacts.com/0/lmms-1.3.0-alpha.1.36%2Bg05eeec4f0-mingw-win32.exe"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/11226?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}, {"artifact": {"title": {"title": "64-bit", "platform_name": "Windows"}, "link": {"link": "https://11229-15778896-gh.circle-artifacts.com/0/lmms-1.3.0-alpha.1.36%2Bg05eeec4f0-mingw-win64.exe"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/11229?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}, {"artifact": {"title": {"title": "32-bit", "platform_name": "Windows"}, "link": {"link": "https://ci.appveyor.com/api/buildjobs/3b8g8x84cfwxyj7k/artifacts/build/lmms-1.3.0-alpha-msvc2017-win32.exe"}}, "build_link": "https://ci.appveyor.com/project/Lukas-W/lmms/builds/36603524"}, {"artifact": {"title": {"title": "64-bit", "platform_name": "Windows"}, "link": {"link": "https://ci.appveyor.com/api/buildjobs/1rx4eh7yel3m788p/artifacts/build/lmms-1.3.0-alpha-msvc2017-win64.exe"}}, "build_link": "https://ci.appveyor.com/project/Lukas-W/lmms/builds/36603524"}]}, "commit_sha": "f0cf00ae8cea7e02d4f09fe5d6bda3902cd60c46"}

@JohannesLorenz
Copy link
Contributor

I'm going to run some tests now, and then we can get this merged.

@JohannesLorenz JohannesLorenz merged commit 67a5da8 into LMMS:master Dec 27, 2020
@JohannesLorenz
Copy link
Contributor

Thanks for the PR! The patch seems to cause no regression, I merged it.

@PhysSong PhysSong mentioned this pull request Dec 27, 2020
@M374LX M374LX deleted the sdl-segfault branch December 30, 2020 23:25
IanCaio pushed a commit to IanCaio/lmms that referenced this pull request Mar 28, 2021
devnexen pushed a commit to devnexen/lmms that referenced this pull request Apr 10, 2021
sdasda7777 pushed a commit to sdasda7777/lmms that referenced this pull request Jun 28, 2022
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.

None yet

4 participants