X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=libpicofe.git;a=blobdiff_plain;f=plat_sdl.c;h=9b78d056785fc180009f0c287f65eb1516dfdaf3;hp=b5e26658144d3621376f25da21f2a9e442c2736a;hb=HEAD;hpb=c7228611128c17b7678379b636759cdbc5f58d80

diff --git a/plat_sdl.c b/plat_sdl.c
index b5e2665..2d537f0 100644
--- a/plat_sdl.c
+++ b/plat_sdl.c
@@ -41,6 +41,14 @@ int plat_sdl_change_video_mode(int w, int h, int force)
 {
   static int prev_w, prev_h;
 
+  // skip GL recreation if window doesn't change - avoids flicker
+  if (plat_target.vout_method == vout_mode_gl && plat_sdl_gl_active
+      && plat_target.vout_fullscreen == old_fullscreen
+      && w == prev_w && h == prev_h && !force)
+  {
+    return 0;
+  }
+
   if (w == 0)
     w = prev_w;
   else
@@ -60,13 +68,6 @@ int plat_sdl_change_video_mode(int w, int h, int force)
     plat_target.vout_method = 0;
   }
 
-  // skip GL recreation if window doesn't change - avoids flicker
-  if (plat_target.vout_method == vout_mode_gl && plat_sdl_gl_active
-      && plat_target.vout_fullscreen == old_fullscreen && !force)
-  {
-    return 0;
-  }
-
   if (plat_sdl_overlay != NULL) {
     SDL_FreeYUVOverlay(plat_sdl_overlay);
     plat_sdl_overlay = NULL;
@@ -105,11 +106,13 @@ int plat_sdl_change_video_mode(int w, int h, int force)
       || plat_target.vout_method == vout_mode_overlay2x) {
     int W = plat_target.vout_method == vout_mode_overlay2x && w < 640 ? 2*w : w;
     plat_sdl_overlay = SDL_CreateYUVOverlay(W, h, SDL_UYVY_OVERLAY, plat_sdl_screen);
-    if (plat_sdl_overlay != NULL) {
+    if (plat_sdl_overlay != NULL && SDL_LockYUVOverlay(plat_sdl_overlay) == 0) {
       if ((long)plat_sdl_overlay->pixels[0] & 3)
         fprintf(stderr, "warning: overlay pointer is unaligned\n");
 
       plat_sdl_overlay_clear();
+
+      SDL_UnlockYUVOverlay(plat_sdl_overlay);
     }
     else {
       fprintf(stderr, "warning: could not create overlay.\n");