From 7c3aa465b29a8ad68e0ae98cd81a4b4e94735a0b Mon Sep 17 00:00:00 2001 From: Christopher Pitstick Date: Sat, 2 Jul 2022 17:12:08 -0400 Subject: [PATCH] Block resize if already this size. While this feature is part of other branches for testing EGFX integration, it somehow never made it into devel. This should fix https://github.com/neutrinolabs/xrdp/issues/1928, for real this time! --- xrdp/xrdp_mm.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/xrdp/xrdp_mm.c b/xrdp/xrdp_mm.c index 9ee7b8e8cc..6c0390a2d9 100644 --- a/xrdp/xrdp_mm.c +++ b/xrdp/xrdp_mm.c @@ -1041,6 +1041,17 @@ process_dynamic_monitor_description(struct xrdp_wm *wm, description->session_width, description->session_height); return 0; } + if (description->session_width + == wm->client_info->display_sizes.session_width + && description->session_height + == wm->client_info->display_sizes.session_height) + { + LOG(LOG_LEVEL_WARNING, "process_display_control_monitor_layout_data:" + " Not resizing. Already this size. (w: %d x h: %d)", + description->session_width, + description->session_height); + return 0; + } // TODO: Unify this logic with server_reset error = libxrdp_reset(wm->session,