The expiration time for new job artifacts in CI/CD pipelines is now 30 days (GitLab default). Previously generated artifacts in already completed jobs will not be affected by the change. The latest artifacts for all jobs in the latest successful pipelines will be kept. More information: https://gitlab.lrz.de/help/user/admin_area/settings/continuous_integration.html#default-artifacts-expiration

Commit e0d06197 authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

Fixed possible deadlock in DataContainerInspectorCanvas::paint() introduced with commit a26fa8dc.

parent 24d8c9e1
......@@ -252,9 +252,10 @@ namespace campvis {
if (_quad != 0 && _paintShader != 0) {
// avoid recursive paints.
if (! cgt::GlContextManager::getRef().checkWhetherThisThreadHasAcquiredOpenGlContext()) {
// TODO: check, whether this should be done in an extra thread
cgt::GLContextScopedLock lock(this);
paint();
std::thread backgroundThread([this] () {
cgt::GLContextScopedLock lock(this);
paint();
});
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment