diff --git a/client/Android/Studio/freeRDPCore/src/main/cpp/android_freerdp.c b/client/Android/Studio/freeRDPCore/src/main/cpp/android_freerdp.c index 5e76e3677..f920998a2 100644 --- a/client/Android/Studio/freeRDPCore/src/main/cpp/android_freerdp.c +++ b/client/Android/Studio/freeRDPCore/src/main/cpp/android_freerdp.c @@ -532,7 +532,6 @@ static BOOL android_client_new(freerdp* instance, rdpContext* context) if (!android_event_queue_init(instance)) return FALSE; - instance->LoadChannels = freerdp_client_load_channels; instance->PreConnect = android_pre_connect; instance->PostConnect = android_post_connect; instance->PostDisconnect = android_post_disconnect; diff --git a/client/Mac/mf_client.m b/client/Mac/mf_client.m index 30e7a2507..281aee92c 100644 --- a/client/Mac/mf_client.m +++ b/client/Mac/mf_client.m @@ -88,7 +88,6 @@ static BOOL mfreerdp_client_new(freerdp *instance, rdpContext *context) WINPR_ASSERT(mfc); mfc->stopEvent = CreateEvent(NULL, TRUE, FALSE, NULL); - context->instance->LoadChannels = freerdp_client_load_channels; context->instance->PreConnect = mac_pre_connect; context->instance->PostConnect = mac_post_connect; context->instance->PostDisconnect = mac_post_disconnect; diff --git a/client/Sample/tf_freerdp.c b/client/Sample/tf_freerdp.c index cfc289c44..4d7419d48 100644 --- a/client/Sample/tf_freerdp.c +++ b/client/Sample/tf_freerdp.c @@ -321,7 +321,6 @@ static BOOL tf_client_new(freerdp* instance, rdpContext* context) if (!instance || !context) return FALSE; - instance->LoadChannels = freerdp_client_load_channels; instance->PreConnect = tf_pre_connect; instance->PostConnect = tf_post_connect; instance->PostDisconnect = tf_post_disconnect; diff --git a/client/Wayland/wlfreerdp.c b/client/Wayland/wlfreerdp.c index 58d097d35..8e487e73f 100644 --- a/client/Wayland/wlfreerdp.c +++ b/client/Wayland/wlfreerdp.c @@ -619,7 +619,6 @@ static BOOL wlf_client_new(freerdp* instance, rdpContext* context) if (!instance || !context) return FALSE; - instance->LoadChannels = freerdp_client_load_channels; instance->PreConnect = wl_pre_connect; instance->PostConnect = wl_post_connect; instance->PostDisconnect = wl_post_disconnect; diff --git a/client/Windows/wf_client.c b/client/Windows/wf_client.c index dc64b92ab..94e3c768e 100644 --- a/client/Windows/wf_client.c +++ b/client/Windows/wf_client.c @@ -1306,7 +1306,6 @@ static BOOL wfreerdp_client_new(freerdp* instance, rdpContext* context) return FALSE; WINPR_ASSERT(instance); - instance->LoadChannels = freerdp_client_load_channels; instance->PreConnect = wf_pre_connect; instance->PostConnect = wf_post_connect; instance->PostDisconnect = wf_post_disconnect; diff --git a/client/X11/xf_client.c b/client/X11/xf_client.c index fdb759828..2f148ce32 100644 --- a/client/X11/xf_client.c +++ b/client/X11/xf_client.c @@ -1834,7 +1834,6 @@ static BOOL xfreerdp_client_new(freerdp* instance, rdpContext* context) WINPR_ASSERT(!xfc->display); WINPR_ASSERT(!xfc->mutex); WINPR_ASSERT(!xfc->x11event); - instance->LoadChannels = freerdp_client_load_channels; instance->PreConnect = xf_pre_connect; instance->PostConnect = xf_post_connect; instance->PostDisconnect = xf_post_disconnect; diff --git a/client/common/client.c b/client/common/client.c index 776023aab..c69910078 100644 --- a/client/common/client.c +++ b/client/common/client.c @@ -64,6 +64,8 @@ static BOOL freerdp_client_common_new(freerdp* instance, rdpContext* context) WINPR_ASSERT(instance); WINPR_ASSERT(context); + instance->LoadChannels = freerdp_client_load_channels; + pEntryPoints = instance->pClientEntryPoints; WINPR_ASSERT(pEntryPoints); return IFCALLRESULT(TRUE, pEntryPoints->ClientNew, instance, context);