From 419ad81aa78d31394c8e8b8452b40ef842f48730 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Mon, 23 Jun 2025 09:46:21 +0200 Subject: [PATCH] Revert "[core,settings] default MonitorIds size to MonitorDefArray size" This reverts commit 90a737d48fc82fc074a47d68ae939041fd222a86. The array is initially empty. Only via command line option or RDP file setting it will be populated. Any use by a client later on requires the client to initialize the array according to its needs --- libfreerdp/core/settings.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libfreerdp/core/settings.c b/libfreerdp/core/settings.c index 747f85633..fa9cf05fa 100644 --- a/libfreerdp/core/settings.c +++ b/libfreerdp/core/settings.c @@ -1668,7 +1668,6 @@ BOOL freerdp_target_net_adresses_reset(rdpSettings* settings, size_t size) BOOL freerdp_settings_enforce_monitor_exists(rdpSettings* settings) { - const UINT32 nrIds = freerdp_settings_get_uint32(settings, FreeRDP_NumMonitorIds); const UINT32 count = freerdp_settings_get_uint32(settings, FreeRDP_MonitorCount); const BOOL fullscreen = freerdp_settings_get_bool(settings, FreeRDP_Fullscreen); const BOOL multimon = freerdp_settings_get_bool(settings, FreeRDP_UseMultimon); @@ -1681,12 +1680,6 @@ BOOL freerdp_settings_enforce_monitor_exists(rdpSettings* settings) return FALSE; } - if (nrIds == 0) - { - const UINT32 dsize = freerdp_settings_get_uint32(settings, FreeRDP_MonitorDefArraySize); - if (!freerdp_settings_set_pointer_len(settings, FreeRDP_MonitorIds, NULL, dsize)) - return FALSE; - } if (!useMonitors || (count == 0)) { const UINT32 width = freerdp_settings_get_uint32(settings, FreeRDP_DesktopWidth);