#4384 don't set default resolution here

only set the initial resolution if one was specified,
and check the randr capability instead of the randr flag because the flag can be set to False to prevent resizing, even though randr is actually available

xpra/x11/desktop/desktop_server.py

@@ -39,11 +39,11 @@ def __init__(self):
 
     def server_init(self) -> None:
         super().server_init()
-        from xpra.x11.vfb_util import set_initial_resolution, get_desktop_vfb_resolutions
+        from xpra.x11.vfb_util import set_initial_resolution
         screenlog(f"server_init() randr={self.randr}, initial-resolutions={self.initial_resolutions}")
-        if not features.display:
+        if not RandR.has_randr() or not self.initial_resolutions or not features.display:
             return
-        res = self.initial_resolutions or get_desktop_vfb_resolutions(default_refresh_rate=self.refresh_rate)
+        res = self.initial_resolutions
         if len(res) > 1:
             log.warn(f"Warning: cannot set desktop resolution to {res}")
             log.warn(" multi monitor mode is not enabled")

xpra/x11/desktop/monitor_server.py

@@ -54,9 +54,11 @@ def __init__(self):
 
     def server_init(self) -> None:
         super().server_init()
-        from xpra.x11.vfb_util import set_initial_resolution, get_desktop_vfb_resolutions
+        from xpra.x11.vfb_util import set_initial_resolution
         screenlog(f"server_init() randr={self.randr}, initial-resolutions={self.initial_resolutions}")
-        res = self.initial_resolutions or get_desktop_vfb_resolutions(default_refresh_rate=self.refresh_rate)
+        if not RandR.has_randr() or not self.initial_resolutions:
+            return
+        res = self.initial_resolutions
         with xlog:
             set_initial_resolution(res, self.dpi or self.default_dpi)