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

Projects
None yet
2 participants
@PhysSong
Member

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 Aug 1, 2017

@zonkmachine

This comment has been minimized.

Show comment
Hide comment
@zonkmachine

zonkmachine Aug 1, 2017

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.

Member

zonkmachine commented Aug 1, 2017

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

This comment has been minimized.

Show comment
Hide comment
@PhysSong

PhysSong Aug 2, 2017

Member

Merge?

Member

PhysSong commented Aug 2, 2017

Merge?

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

1 check was pending

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
@zonkmachine

This comment has been minimized.

Show comment
Hide comment
@zonkmachine

zonkmachine Aug 2, 2017

Member

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

Member

zonkmachine commented Aug 2, 2017

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

zonkmachine added a commit that referenced this pull request Aug 2, 2017

@PhysSong PhysSong deleted the PhysSong:deadlock-fix branch Aug 2, 2017

@PhysSong

This comment has been minimized.

Show comment
Hide comment
@PhysSong

PhysSong Aug 2, 2017

Member

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

Member

PhysSong commented Aug 2, 2017

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

@zonkmachine

This comment has been minimized.

Show comment
Hide comment
@zonkmachine

zonkmachine Aug 2, 2017

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.

Member

zonkmachine commented Aug 2, 2017

?! 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.

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