reject resolutions with aspect ratio > 2:1 (broken X.org xinerama stuff); if no resol...

diff --git a/qcsrc/menu/xonotic/slider_resolution.c b/qcsrc/menu/xonotic/slider_resolution.c
index 0cfa6ad2a641880ffc916eb2113e27d9f1373fab..06991f35a1b8f50da04e57aa74402e6b690a3842 100644 (file)
--- a/qcsrc/menu/xonotic/slider_resolution.c
+++ b/qcsrc/menu/xonotic/slider_resolution.c
@@ -85,9 +85,22 @@ void XonoticResolutionSlider_configureXonoticResolutionSlider(entity me)
                r0 = r;
                if(r_x < 640 || r_y < 480)
                        continue;
+               if(r_x > 2 * r_y) // likely dualscreen resolution, skip this one
+                       continue;
                me.addResolution(me, r_x, r_y, r_z);
        }
 
+       if(me.nValues == 0)
+       {
+               me.addResolution(me, 640, 480, 1);
+               me.addResolution(me, 800, 600, 1);
+               me.addResolution(me, 1024, 768, 1);
+               me.addResolution(me, 1280, 960, 1);
+               me.addResolution(me, 1280, 1024, 1);
+               me.addResolution(me, 1650, 1080, 1);
+               me.addResolution(me, 1920, 1080, 1);
+       }
+
        me.configureXonoticTextSliderValues(me);
 }
 void XonoticResolutionSlider_loadCvars(entity me)