x11: Don't delay an extra 10ms if we were just going to break out of the loop.

This commit is contained in:
Ryan C. Gordon 2020-02-17 15:02:37 -05:00
parent 367a8b9701
commit e731522578

View File

@ -824,7 +824,7 @@ X11_SetWindowPosition(_THIS, SDL_Window * window)
/* Wait a brief time to see if the window manager decided to let this move happen. /* Wait a brief time to see if the window manager decided to let this move happen.
If the window changes at all, even to an unexpected value, we break out. */ If the window changes at all, even to an unexpected value, we break out. */
timeout = SDL_GetTicks() + 100; timeout = SDL_GetTicks() + 100;
do { while (SDL_TRUE) {
int x, y; int x, y;
X11_XSync(display, False); X11_XSync(display, False);
X11_XGetWindowAttributes(display, data->xwindow, &attrs); X11_XGetWindowAttributes(display, data->xwindow, &attrs);
@ -839,8 +839,12 @@ X11_SetWindowPosition(_THIS, SDL_Window * window)
break; /* we're at the place we wanted to be anyhow, drop out. */ break; /* we're at the place we wanted to be anyhow, drop out. */
} }
if (SDL_TICKS_PASSED(SDL_GetTicks(), timeout)) {
break;
}
SDL_Delay(10); SDL_Delay(10);
} while (!SDL_TICKS_PASSED(SDL_GetTicks(), timeout)); }
} }
void void