mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6138 from akallabeth/rdp_file_message_fix

Browse Source 
Fixed warning messages for RDP file options
This commit is contained in:
Martin Fleisz 2020-05-05 12:21:15 +02:00 committed by GitHub
commit 953fc03031
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
client/common/file.c
View File

@ -1614,30 +1614,14 @@ BOOL freerdp_client_populate_settings_from_rdp_file(rdpFile* file, rdpSettings*
{
if (file->BandwidthAutoDetect != 0)
{
if (!freerdp_set_connection_type(settings, CONNECTION_TYPE_AUTODETECT))
return FALSE;
setDefaultConnectionType = FALSE;
}
if (!freerdp_settings_set_bool(settings, FreeRDP_NetworkAutoDetect,
file->BandwidthAutoDetect != 0))
return FALSE;
}
if (~file->NetworkAutoDetect)
{
if (file->NetworkAutoDetect == 0)
{
if (file->BandwidthAutoDetect != CONNECTION_TYPE_AUTODETECT)
if ((~file->NetworkAutoDetect) && (file->NetworkAutoDetect != 0))
{
WLog_WARN(TAG,
"Got networkautodetect:i:%" PRIu32 " and bandwidthautodetect:i:%" PRIu32
". Correcting to bandwidthautodetect:i:%" PRIu32,
file->NetworkAutoDetect, file->BandwidthAutoDetect,
CONNECTION_TYPE_AUTODETECT);
". Correcting to networkautodetect:i:0",
file->NetworkAutoDetect, file->BandwidthAutoDetect);
WLog_WARN(TAG,
"Add bandwidthautodetect:i:%" PRIu32
" to your RDP file to eliminate this warning.",
CONNECTION_TYPE_AUTODETECT);
"Add networkautodetect:i:0 to your RDP file to eliminate this warning.");
}
if (!freerdp_set_connection_type(settings, CONNECTION_TYPE_AUTODETECT))
@ -1645,7 +1629,33 @@ BOOL freerdp_client_populate_settings_from_rdp_file(rdpFile* file, rdpSettings*
setDefaultConnectionType = FALSE;
}
if (!freerdp_settings_set_bool(settings, FreeRDP_NetworkAutoDetect,
file->NetworkAutoDetect == 0))
(file->BandwidthAutoDetect != 0) ||
(file->NetworkAutoDetect == 0)))
return FALSE;
}
if (~file->NetworkAutoDetect)
{
if (file->NetworkAutoDetect == 0)
{
if ((~file->BandwidthAutoDetect) && (file->BandwidthAutoDetect == 0))
{
WLog_WARN(TAG,
"Got networkautodetect:i:%" PRIu32 " and bandwidthautodetect:i:%" PRIu32
". Correcting to bandwidthautodetect:i:1",
file->NetworkAutoDetect, file->BandwidthAutoDetect);
WLog_WARN(
TAG, "Add bandwidthautodetect:i:1 to your RDP file to eliminate this warning.");
}
if (!freerdp_set_connection_type(settings, CONNECTION_TYPE_AUTODETECT))
return FALSE;
setDefaultConnectionType = FALSE;
}
if (!freerdp_settings_set_bool(settings, FreeRDP_NetworkAutoDetect,
(file->BandwidthAutoDetect != 0) ||
(file->NetworkAutoDetect == 0)))
return FALSE;
}