Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1071c201 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am 17da0663: Merge "fix [2931161] crash in labyritnth when completing a level" into gingerbread 

Merge commit '17da06631041f9f2237738fb673a74a85b1d9cf4' into gingerbread-plus-aosp

* commit '17da06631041f9f2237738fb673a74a85b1d9cf4':
  fix [2931161] crash in labyritnth when completing a level
parents 00b4ee02 5de4b2f2

opengl/libagl/egl.cpp

+35 −32
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ EGLBoolean egl_window_surface_v2_t::swapBuffers() 
    buffer = 0;



    // dequeue a new buffer

    nativeWindow->dequeueBuffer(nativeWindow, &buffer);

    if (nativeWindow->dequeueBuffer(nativeWindow, &buffer) == NO_ERROR) {



        // TODO: lockBuffer should rather be executed when the very first

        // direct rendering occurs.
@@ -612,6 +612,9 @@ EGLBoolean egl_window_surface_v2_t::swapBuffers() 
            return setError(EGL_BAD_ACCESS, EGL_FALSE);

            // FIXME: we should make sure we're not accessing the buffer anymore

        }

    } else {

        return setError(EGL_BAD_CURRENT_SURFACE, EGL_FALSE);

    }



    return EGL_TRUE;

}