am f1207573: am fe3de568: Merge "System egl: fix eglInitialize"

* commit 'f1207573cec993937bbecbb869eb559209d6c0df': System egl: fix eglInitialize
2011-07-06 07:46:12 -07:00
parent 5d7d0564fc f1207573ce
commit bd46dff80b
1 changed files with 4 additions and 3 deletions
--- a/tools/emulator/opengl/system/egl/egl.cpp
+++ b/tools/emulator/opengl/system/egl/egl.cpp
@@ -547,9 +547,10 @@ EGLBoolean eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor)
    if (!s_display.initialize(&s_eglIface)) {
        return EGL_FALSE;
    }
-
-    *major = s_display.getVersionMajor();
-    *minor = s_display.getVersionMinor();
+    if (major!=NULL)
+        *major = s_display.getVersionMajor();
+    if (minor!=NULL)
+        *minor = s_display.getVersionMinor();
    return EGL_TRUE;
 }