--- a/src/video/x11/SDL_x11modes.c	Fri Oct 02 13:50:50 2009 +0000
+++ b/src/video/x11/SDL_x11modes.c	Sun Oct 04 20:30:45 2009 +0000
@@ -1008,12 +1008,8 @@
     screen_w = DisplayWidth(SDL_Display, SDL_Screen);
     screen_h = DisplayHeight(SDL_Display, SDL_Screen);
     get_real_resolution(this, &real_w, &real_h);
-    if ( window_w > real_w ) {
-        real_w = MAX(real_w, screen_w);
-    }
-    if ( window_h > real_h ) {
-        real_h = MAX(real_h, screen_h);
-    }
+    real_w = MAX(window_w, MAX(real_w, screen_w));
+    real_h = MAX(window_h, MAX(real_h, screen_h));
     XMoveResizeWindow(SDL_Display, FSwindow,
                       x, y, real_w, real_h);
     XMapRaised(SDL_Display, FSwindow);