Merge "When disconnecting a surface, cancel don't queue the buffer" into jb-mr2-dev

2013-03-07 23:43:56 +00:00 · 2013-03-07 23:43:56 +00:00 · 49385ec7c3
parent 86306b5876 5f555569e7
commit 49385ec7c3
1 changed files with 1 additions and 2 deletions
--- a/opengl/libagl/egl.cpp
+++ b/opengl/libagl/egl.cpp
@ -420,9 +420,8 @@ void egl_window_surface_v2_t::disconnect()
        bits = NULL;
        unlock(buffer);
    }
-    // enqueue the last frame
-    nativeWindow->queueBuffer(nativeWindow, buffer, -1);
    if (buffer) {
+        nativeWindow->cancelBuffer(nativeWindow, buffer, -1);
        buffer->common.decRef(&buffer->common);
        buffer = 0;
    }