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 deadlock when exporting is finished, if the project has any Sample TCO(s). #3742

Merged
merged 2 commits into from
Aug 2, 2017

Conversation

PhysSong
Copy link
Member

@PhysSong PhysSong commented Aug 1, 2017

Fixes #3344.
Calls stopProcessing() when the rendering ends, to prevent requsetChangeInModels() from waiting for runChangesInModels(), which causes a deadlock.
#3344 (comment) is another solution, but this one is more fundamental than #3344 (comment).

Tested for both GUI and CLI, and both single-file rendering and rendering per track, works well.

@PhysSong PhysSong requested a review from zonkmachine August 1, 2017 06:55
@zonkmachine
Copy link
Member

Tested, works!

Exported from gui and command line, single samples and complex projects.
As for the code of it I'm not qualified to answer... :) I suggest merge.

@PhysSong
Copy link
Member Author

PhysSong commented Aug 2, 2017

Merge?

@zonkmachine zonkmachine merged commit 08e64dc into LMMS:stable-1.2 Aug 2, 2017
@zonkmachine
Copy link
Member

@PhysSong I'll 'bump' this to master too.

zonkmachine pushed a commit that referenced this pull request Aug 2, 2017
@PhysSong PhysSong deleted the deadlock-fix branch August 2, 2017 07:35
@PhysSong
Copy link
Member Author

PhysSong commented Aug 2, 2017

@zonkmachine Does it really needed? This will be in master once we merge stable-1.2 intomaster.

@zonkmachine
Copy link
Member

?! You're right there. I don't know where I got the idea that this was the way to go actually...
Probably from the large merge of stable-1.2 into master we had which got a bit cumbersome.

sdasda7777 pushed a commit to sdasda7777/lmms that referenced this pull request Jun 28, 2022
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.

2 participants