github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reparse command line after RDP or assistance file.

Browse Source
This commit is contained in:
Armin Novak 2016-03-07 09:43:53 +01:00
parent 36241ed540
commit 4bb33e904a
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
client/common/client.c
View File

@ -196,14 +196,19 @@ int freerdp_client_settings_parse_command_line(rdpSettings* settings, int argc,
status = freerdp_client_settings_parse_command_line_arguments(settings, argc, argv, allowUnknown); status = freerdp_client_settings_parse_command_line_arguments(settings, argc, argv, allowUnknown);
if (settings->ConnectionFile) if (settings->ConnectionFile)
{
status = freerdp_client_settings_parse_connection_file(settings, settings->ConnectionFile); status = freerdp_client_settings_parse_connection_file(settings, settings->ConnectionFile);
}
if (settings->AssistanceFile) if (settings->AssistanceFile)
{
status = freerdp_client_settings_parse_assistance_file(settings, settings->AssistanceFile); status = freerdp_client_settings_parse_assistance_file(settings, settings->AssistanceFile);
}
if (status < 0)
return status;
/* In case settings have been populated from a RDP or assistance file
* reparse the command line to give priotiry to command line for concurring settings.
*/
if (settings->ConnectionFile || settings->AssistanceFile)
status = freerdp_client_settings_parse_command_line_arguments(settings, argc, argv, allowUnknown);
/* Only call post processing if no status/error was returned*/ /* Only call post processing if no status/error was returned*/
if (status < 0) if (status < 0)