From 40124c11a6b32c7f95483a7866793e9c8cbe6d86 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Thu, 26 Jun 2014 15:32:35 -0700 Subject: [PATCH] GUAC-744: Send ready instruction BEFORE guac_client_init. Sending after is just crazy. --- src/guacd/daemon.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/guacd/daemon.c b/src/guacd/daemon.c index cbcceb1c..c854edaf 100644 --- a/src/guacd/daemon.c +++ b/src/guacd/daemon.c @@ -216,6 +216,10 @@ void guacd_handle_connection(guac_socket* socket) { sizeof(char*) * video->argc); client->info.video_mimetypes[video->argc] = NULL; + /* Send connection ID */ + guacd_log_info("Connection ID is \"%s\"", client->connection_id); + guac_protocol_send_ready(socket, client->connection_id); + /* Init client */ init_result = guac_client_plugin_init_client(plugin, client, connect->argc, connect->argv); @@ -236,10 +240,6 @@ void guacd_handle_connection(guac_socket* socket) { return; } - /* Send connection ID */ - guacd_log_info("Connection ID is \"%s\"", client->connection_id); - guac_protocol_send_ready(socket, client->connection_id); - /* Start client threads */ guacd_log_info("Starting client"); if (guacd_client_start(client))