Skip to content
Snippets Groups Projects
Commit 90049ff5 authored by Paul McCarthy's avatar Paul McCarthy
Browse files

Tweak to SliceCanvas globject manamgement - if an idle create task fails,

it clears the pending flag for a GLOBject.
parent 83f5c8fd
No related branches found
No related tags found
No related merge requests found
...@@ -264,7 +264,9 @@ class SliceCanvas(props.HasProperties): ...@@ -264,7 +264,9 @@ class SliceCanvas(props.HasProperties):
disp.removeListener('overlayType', self.name) disp.removeListener('overlayType', self.name)
disp.removeListener('enabled', self.name) disp.removeListener('enabled', self.name)
if globj is not None: # globj could be None, or could
# be False - see genGLObject.
if globj:
globj.deregister(self.name) globj.deregister(self.name)
globj.destroy() globj.destroy()
...@@ -790,6 +792,7 @@ class SliceCanvas(props.HasProperties): ...@@ -790,6 +792,7 @@ class SliceCanvas(props.HasProperties):
# We need a GL context to create a new GL # We need a GL context to create a new GL
# object. If we can't get it now, # object. If we can't get it now,
if not self._setGLContext(): if not self._setGLContext():
self._glObjects.pop(overlay)
return return
globj = globject.createGLObject(overlay, display) globj = globject.createGLObject(overlay, display)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment