always set a default initial resolution

because otherwise when running on Debian, the 'Xvfb' command will choose 8K
Xpra-org · Aug 17, 2024 · a5edfc6 · a5edfc6
1 parent 3c66507
commit a5edfc6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/xpra/x11/desktop/desktop_server.py b/xpra/x11/desktop/desktop_server.py
@@ -39,7 +39,7 @@ def server_init(self) -> None:
         super().server_init()
         from xpra.x11.vfb_util import set_initial_resolution, get_desktop_vfb_resolutions
         screenlog(f"server_init() randr={self.randr}, initial-resolutions={self.initial_resolutions}")
-        if not self.randr or self.initial_resolutions==() or not server_features.display:
+        if not self.randr or not server_features.display:
             return
         res = self.initial_resolutions or get_desktop_vfb_resolutions(default_refresh_rate=self.refresh_rate)
         if len(res)>1:

diff --git a/xpra/x11/desktop/monitor_server.py b/xpra/x11/desktop/monitor_server.py
@@ -49,8 +49,6 @@ def server_init(self) -> None:
         super().server_init()
         from xpra.x11.vfb_util import set_initial_resolution, get_desktop_vfb_resolutions
         screenlog(f"server_init() randr={self.randr}, initial-resolutions={self.initial_resolutions}")
-        if self.initial_resolutions==():
-            return
         res = self.initial_resolutions or get_desktop_vfb_resolutions(default_refresh_rate=self.refresh_rate)
         with xlog:
             set_initial_resolution(res, self.dpi or self.default_dpi)