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

Init extensions in pre_connect stage.

Browse Source 
Due to the client is parsing the args in pre_connect,
we should start loading the extensions after client parsing the args.

Signed-off-by: Ying-Chun Liu (PaulLiu) <paul.liu@canonical.com>
(cherry picked from commit 48ad5feb0a)

Conflicts:
	libfreerdp-core/rdp.c
This commit is contained in:
Ying-Chun Liu (PaulLiu) 2012-06-19 14:49:53 +08:00 committed by Bernhard Miklautz
parent eecb39b5a7
commit 69dd64c5b7
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libfreerdp-core/freerdp.c
View File

@ -35,8 +35,6 @@ boolean freerdp_connect(freerdp* instance)
rdp = instance->context->rdp;
extension_pre_connect(rdp->extension);
IFCALLRET(instance->PreConnect, status, instance);
if (status != true)
@ -45,6 +43,9 @@ boolean freerdp_connect(freerdp* instance)
return false;
}
rdp->extension = extension_new(instance);
extension_pre_connect(rdp->extension);
status = rdp_client_connect(rdp);
if (status)

2
libfreerdp-core/rdp.c
View File

@ -878,7 +878,7 @@ rdpRdp* rdp_new(freerdp* instance)
rdp->settings = settings_new((void*) instance);
if (instance != NULL)
instance->settings = rdp->settings;
rdp->extension = extension_new(instance);
rdp->transport = transport_new(rdp->settings);
rdp->license = license_new(rdp);
rdp->input = input_new(rdp);