[PATCH 1/5] winex11.drv: Set desktop settings handler before updating display devices.
Rémi Bernon
wine at gitlab.winehq.org
Mon Jun 27 07:50:20 CDT 2022
From: Rémi Bernon <rbernon at codeweavers.com>
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
---
dlls/winex11.drv/desktop.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c
index bc2ba60397b..d89f1b39983 100644
--- a/dlls/winex11.drv/desktop.c
+++ b/dlls/winex11.drv/desktop.c
@@ -301,6 +301,16 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height )
max_width = primary_rect.right;
max_height = primary_rect.bottom;
+ /* Initialize virtual desktop display settings handler */
+ settings_handler.name = "Virtual Desktop";
+ settings_handler.priority = 1000;
+ settings_handler.get_id = X11DRV_desktop_get_id;
+ settings_handler.get_modes = X11DRV_desktop_get_modes;
+ settings_handler.free_modes = X11DRV_desktop_free_modes;
+ settings_handler.get_current_mode = X11DRV_desktop_get_current_mode;
+ settings_handler.set_current_mode = X11DRV_desktop_set_current_mode;
+ X11DRV_Settings_SetHandler( &settings_handler );
+
/* Initialize virtual desktop mode display device handler */
desktop_handler.name = "Virtual Desktop";
desktop_handler.get_gpus = X11DRV_desktop_get_gpus;
@@ -312,16 +322,6 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height )
desktop_handler.register_event_handlers = NULL;
TRACE("Display device functions are now handled by: Virtual Desktop\n");
X11DRV_DisplayDevices_Init( TRUE );
-
- /* Initialize virtual desktop display settings handler */
- settings_handler.name = "Virtual Desktop";
- settings_handler.priority = 1000;
- settings_handler.get_id = X11DRV_desktop_get_id;
- settings_handler.get_modes = X11DRV_desktop_get_modes;
- settings_handler.free_modes = X11DRV_desktop_free_modes;
- settings_handler.get_current_mode = X11DRV_desktop_get_current_mode;
- settings_handler.set_current_mode = X11DRV_desktop_set_current_mode;
- X11DRV_Settings_SetHandler( &settings_handler );
}
--
GitLab
https://gitlab.winehq.org/wine/wine/-/merge_requests/322
More information about the wine-devel
mailing list