morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11007 from akallabeth/regression-fix

Browse Source 
Regression fix
This commit is contained in:
akallabeth
2024-12-19 16:48:09 +01:00
committed by GitHub
parent 1248221b16 62beb27f23
commit 5f85a28906
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libfreerdp/core/settings.c
View File

@@ -1709,6 +1709,13 @@ BOOL freerdp_settings_enforce_monitor_exists(rdpSettings* settings)
const BOOL multimon = freerdp_settings_get_bool(settings, FreeRDP_UseMultimon);
const BOOL useMonitors = fullscreen || multimon;
const UINT32 size = freerdp_settings_get_uint32(settings, FreeRDP_MonitorDefArraySize);
if (size == 0)
{
if (!freerdp_settings_set_pointer_len(settings, FreeRDP_MonitorDefArray, NULL, 16))
return FALSE;
}
if (nrIds == 0)
{
if (!freerdp_settings_set_uint32(settings, FreeRDP_NumMonitorIds, 1))
@@ -1750,7 +1757,6 @@ BOOL freerdp_settings_enforce_monitor_exists(rdpSettings* settings)
}
else if (fullscreen || (multimon && (count == 1)))
{
/* not all platforms start primary monitor at 0/0, so enforce this to avoid issues with
* fullscreen mode */
rdpMonitor* monitor =

3
libfreerdp/core/transport.c
View File

@@ -151,9 +151,6 @@ wStream* transport_send_stream_init(rdpTransport* transport, size_t size)
{
WINPR_ASSERT(transport);
if (!transport->frontBio)
return NULL;
wStream* s = StreamPool_Take(transport->ReceivePool, size);
if (!s)
return NULL;