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

Solves deadlocking when opening a saved project #685

Merged

Conversation

SamCarlberg
Copy link
Member

@SamCarlberg SamCarlberg commented Oct 12, 2016

Fixes a deadlock when loading a project while an output image is being rendered

Fixes a deadlock when loading a project in the middle of an output image being rendered
@SamCarlberg SamCarlberg added this to the v1.5.0 milestone Oct 12, 2016
@SamCarlberg SamCarlberg self-assigned this Oct 12, 2016
Copy link
Member

@JLLeitschuh JLLeitschuh left a comment

Choose a reason for hiding this comment

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

This looks good. I don't think we have any tests for this unfortunately.

@JLLeitschuh
Copy link
Member

Fails checkstyle on windows.

@JLLeitschuh
Copy link
Member

JLLeitschuh commented Oct 12, 2016

@codecov-io
Copy link

codecov-io commented Oct 12, 2016

Current coverage is 54.50% (diff: 0.00%)

Merging #685 into master will decrease coverage by 0.05%

@@             master       #685   diff @@
==========================================
  Files           209        209          
  Lines          6706       6713     +7   
  Methods           0          0          
  Messages          0          0          
  Branches        656        656          
==========================================
  Hits           3659       3659          
- Misses         2878       2886     +8   
+ Partials        169        168     -1   

Sunburst

Powered by Codecov. Last update 7f1498c...926eb7b

@SamCarlberg SamCarlberg merged commit 1d02ed1 into WPIRoboticsProjects:master Oct 12, 2016
@SamCarlberg SamCarlberg deleted the fix/project-open-deadlock branch October 12, 2016 20:52
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.

3 participants