Destroy overlay window on shutting down GLES compositing

This commit is contained in:
Martin Gräßlin 2011-04-23 16:14:30 +02:00
parent 38859ebe4c
commit 99c3999881

View file

@ -61,6 +61,11 @@ SceneOpenGL::SceneOpenGL(Workspace* ws)
SceneOpenGL::~SceneOpenGL() SceneOpenGL::~SceneOpenGL()
{ {
if (!init_ok) {
// TODO this probably needs to clean up whatever has been created until the failure
wspace->destroyOverlay();
return;
}
foreach (Window * w, windows) foreach (Window * w, windows)
delete w; delete w;
// do cleanup after initBuffer() // do cleanup after initBuffer()
@ -71,6 +76,9 @@ SceneOpenGL::~SceneOpenGL()
eglReleaseThread(); eglReleaseThread();
SceneOpenGL::EffectFrame::cleanup(); SceneOpenGL::EffectFrame::cleanup();
checkGLError("Cleanup"); checkGLError("Cleanup");
if (wspace->overlayWindow()) {
wspace->destroyOverlay();
}
} }
bool SceneOpenGL::initTfp() bool SceneOpenGL::initTfp()