mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/FreeRDP/FreeRDP

This commit is contained in:
Jean-Louis Dupond 2014-10-17 12:11:17 +02:00
parent 0dc0e01568 56982d6100
commit a4f118966d
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/Wayland/wlfreerdp.c
View File

@ -394,8 +394,6 @@ int main(int argc, char* argv[])
int status;
freerdp* instance;
freerdp_channels_global_init();
instance = freerdp_new();
instance->PreConnect = wl_pre_connect;
instance->PostConnect = wl_post_connect;
@ -405,16 +403,16 @@ int main(int argc, char* argv[])
instance->ContextFree = wl_context_free;
freerdp_context_new(instance);
status = freerdp_client_parse_command_line_arguments(argc, argv, instance->settings);
status = freerdp_client_settings_parse_command_line_arguments(instance->settings, argc, argv);
if (status < 0)
status = freerdp_client_settings_command_line_status_print(instance->settings, status, argc, argv);
if (status)
exit(0);
freerdp_client_load_addins(instance->context->channels, instance->settings);
wlfreerdp_run(instance);
freerdp_channels_global_uninit();
return 0;
}