X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fsdl2%2Fg_system.pas;h=e4bd07046a8576bbecdc7763b13cbe282295e062;hb=1c7e7630a308e9c9dc03f1e6f3483f9ce8f52618;hp=6fff48bf9df526a268efb91334fdc23c31984b08;hpb=26f953e608c57414593e6c1168b8340751d41f91;p=d2df-sdl.git

diff --git a/src/game/sdl2/g_system.pas b/src/game/sdl2/g_system.pas
index 6fff48b..e4bd070 100644
--- a/src/game/sdl2/g_system.pas
+++ b/src/game/sdl2/g_system.pas
@@ -158,9 +158,9 @@ implementation
         begin
           {$IFDEF NOGL_INIT}
           nogl_Init;
-          if glRenderToFBO and (not nogl_ExtensionSupported('GL_OES_framebuffer_object')) then
+          if (not nogl_ExtensionSupported('GL_OES_framebuffer_object')) and glRenderToFBO then
           {$ELSE}
-          if glRenderToFBO and (not Load_GL_ARB_framebuffer_object()) then
+          if (not Load_GL_ARB_framebuffer_object()) and glRenderToFBO then
           {$ENDIF}
           begin
             e_LogWriteln('SDL: no framebuffer object support detected');
@@ -191,8 +191,12 @@ implementation
     end
     else
     begin
+      if fullScreen then flags := SDL_WINDOW_FULLSCREEN else flags := 0;
+      SDL_SetWindowFullscreen(window, flags);
       SDL_SetWindowSize(window, w, h);
-      if wc then
+      if maximized then SDL_MaximizeWindow(window);
+      // always reset to center when changing fullscreen->windowed for safety purposes
+      if wc or (gFullscreen and not fullscreen) or (gWinMaximized and not maximized) then
       begin
         x := SDL_WINDOWPOS_CENTERED;
         y := SDL_WINDOWPOS_CENTERED
@@ -208,10 +212,6 @@ implementation
         SDL_GetWindowPosition(window, @x, @y);
         wx := x; wy := y
       end;
-      if maximized then
-        SDL_MaximizeWindow(window);
-      if fullScreen then flags := SDL_WINDOW_FULLSCREEN else flags := 0;
-      SDL_SetWindowFullscreen(window, flags);
       gFullScreen := fullscreen;
       gWinMaximized := maximized;
       gRC_FullScreen := fullscreen;