From ca0107ba5473ead3ae07b50552b7d9d6a3a33631 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 3 Dec 2014 15:43:39 -0800 Subject: [PATCH] GUAC-945: Do not attempt to load drdynvc unless Display Update is in use. The interface of drdynvc is too different in versions of FreeRDP lacking Display Update. --- src/protocols/rdp/client.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/protocols/rdp/client.c b/src/protocols/rdp/client.c index e97ea1df..f4c0d0d5 100644 --- a/src/protocols/rdp/client.c +++ b/src/protocols/rdp/client.c @@ -212,12 +212,6 @@ BOOL rdp_freerdp_pre_connect(freerdp* instance) { freerdp_register_addin_provider(freerdp_channels_load_static_addin_entry, 0); #endif - /* Load virtual channel management plugin */ - if (freerdp_channels_load_plugin(channels, instance->settings, - "drdynvc", instance->settings)) - guac_client_log(client, GUAC_LOG_WARNING, - "Failed to load drdynvc plugin."); - #ifdef HAVE_FREERDP_EVENT_PUBSUB /* Subscribe to and handle channel connected events */ PubSub_SubscribeChannelConnected(context->pubSub, @@ -225,6 +219,12 @@ BOOL rdp_freerdp_pre_connect(freerdp* instance) { #endif #ifdef HAVE_FREERDP_DISPLAY_UPDATE_SUPPORT + /* Load virtual channel management plugin */ + if (freerdp_channels_load_plugin(channels, instance->settings, + "drdynvc", instance->settings)) + guac_client_log(client, GUAC_LOG_WARNING, + "Failed to load drdynvc plugin."); + /* Init display update plugin */ guac_client_data->disp = guac_rdp_disp_alloc(); guac_rdp_disp_load_plugin(instance->context);