commit a3a351e5d164d0c8b461ae7af86edc0227654a76
author Jack Palevich <jackpal@google.com> Fri Nov 06 16:35:19 2009 -0800
committer Jack Palevich <jackpal@google.com> Fri Nov 06 16:35:19 2009 -0800
tree a321acc2bd61f1ee164e4db6f01302155d719b47
parent f6ff2be323812b5525a0755d194b2fc751ba5968
parent 4e3fadd0c99d2774709a067e017d8fd622440f0e

resolved conflicts for merge of 4e3fadd0 to eclair-mr2

opengl/java/android/opengl/GLSurfaceView.java

diff --git a/opengl/java/android/opengl/GLSurfaceView.java b/opengl/java/android/opengl/GLSurfaceView.java
index cbe5be4..f11123e 100644
--- a/opengl/java/android/opengl/GLSurfaceView.java
+++ b/opengl/java/android/opengl/GLSurfaceView.java
@@ -1299,9 +1299,16 @@
 
             GLThread oldThread = null;
             synchronized(this) {
-                mMostRecentGLThread = thread;
                 oldThread = mMostRecentGLThread;
+                mMostRecentGLThread = thread;
+            }
+            if (oldThread != null && ! mMultipleGLESContextsAllowed) {
+                synchronized(oldThread) {
+                    oldThread.notifyAll();
+                }
+            }
 
+            synchronized(this) {
                 while ((! mMultipleGLESContextsAllowed)
                         && mGLContextCount > 0) {
                     wait();
@@ -1309,12 +1316,6 @@
 
                 mGLContextCount++;
             }
-
-            if (oldThread != null && ! mMultipleGLESContextsAllowed) {
-                synchronized(oldThread) {
-                    oldThread.notifyAll();
-                }
-            }
         }
 
         public synchronized void end(GLThread thread) {