From: Sylvain Beucler <beuc@beuc.net>
Date: Sun, 19 May 2013 15:01:33 +0000 (+0000)
Subject: Fix random crash
X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=commitdiff_plain;ds=sidebyside;h=05f3812f4a74966cb62223ba4ef999d3b0c9f24c;p=freeglut

Fix random crash

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1621 7f0cb862-5218-0410-a997-914c9d46530a
---

diff --git a/src/android/fg_main_android.c b/src/android/fg_main_android.c
index 7016755..acdba1f 100644
--- a/src/android/fg_main_android.c
+++ b/src/android/fg_main_android.c
@@ -330,7 +330,6 @@ void handle_cmd(struct android_app* app, int32_t cmd) {
     /* The window is being shown, get it ready. */
     LOGI("handle_cmd: APP_CMD_INIT_WINDOW %p", app->window);
     fgDisplay.pDisplay.single_native_window = app->window;
-    window->State.WorkMask |= GLUT_INIT_WORK;
     /* start|resume: glPlatformOpenWindow was waiting for Handle to be
        defined and will now continue processing */
     break;
diff --git a/src/android/fg_window_android.c b/src/android/fg_window_android.c
index 370f1dc..1b4c80f 100644
--- a/src/android/fg_window_android.c
+++ b/src/android/fg_window_android.c
@@ -64,6 +64,7 @@ void fgPlatformOpenWindow( SFG_Window* window, const char* title,
     /* fgPlatformProcessSingleEvent(); */
   }
   window->Window.Handle = fgDisplay.pDisplay.single_native_window;
+  window->State.WorkMask |= GLUT_INIT_WORK;
 
   /* Create context */
   fghChooseConfig(&window->Window.pContext.egl.Config);