Fix race condition.

hrydgard · Nov 10, 2017 · c32f505 · unknownbrackets · Nov 11, 2017 · hrydgard
1 parent 378e016
commit c32f505
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/android/src/org/ppsspp/ppsspp/NativeActivity.java b/android/src/org/ppsspp/ppsspp/NativeActivity.java
@@ -518,24 +518,29 @@ public void onCreate(Bundle savedInstanceState) {
         }
     }
 
+	Point desiredSize = new Point();
+
 	@Override
 	public void surfaceCreated(SurfaceHolder holder) {
 		pixelWidth = holder.getSurfaceFrame().width();
 		pixelHeight = holder.getSurfaceFrame().height();
 		Log.d(TAG, "Surface created. pixelWidth=" + pixelWidth + ", pixelHeight=" + pixelHeight);
 		NativeApp.setDisplayParameters(pixelWidth, pixelHeight, (int)densityDpi, refreshRate);
-		Point sz = new Point();
+		getDesiredBackbufferSize(desiredSize);
-		getDesiredBackbufferSize(sz);
+		Log.d(TAG, "Setting fixed size " + desiredSize.x + " x " + desiredSize.y);
-		Log.d(TAG, "Setting fixed size " + sz.x + " x " + sz.y);
 		if (mGLSurfaceView != null) {
-			mGLSurfaceView.getHolder().setFixedSize(sz.x, sz.y);
+			mGLSurfaceView.getHolder().setFixedSize(desiredSize.x, desiredSize.y);
 		} else {
-			mSurfaceView.getHolder().setFixedSize(sz.x, sz.y);
+			mSurfaceView.getHolder().setFixedSize(desiredSize.x, desiredSize.y);
 		}
 	}
 
 	@Override
 	public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
+		if (width != desiredSize.x || height != desiredSize.y) {
+			Log.w(TAG, "Surface changed but not to desired size. Ignoring.");
+			return;
+		}
 		Log.w(TAG, "Surface changed. Resolution: " + width + "x" + height + " Format: " + format);
 		NativeApp.backbufferResize(width, height, format);
 		mSurface = holder.getSurface();