maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'unstable' of ssh://guacamole.git.sourceforge.net/gitroot/guacamole/libguac into unstable

Browse Source
This commit is contained in:
Michael Jumper 2011-03-20 23:02:36 -07:00
commit 1e33435c22
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libguac/src/client.c
View File

@ -182,7 +182,7 @@ guac_client* guac_get_client(int client_fd) {
client_args = (const char**) dlsym(client->client_plugin_handle, "GUAC_CLIENT_ARGS"); client_args = (const char**) dlsym(client->client_plugin_handle, "GUAC_CLIENT_ARGS");
if ((error = dlerror()) != NULL) { if ((error = dlerror()) != NULL) {
guac_log_error("Could not get GUAC_CLIENT_ in plugin: %s\n", error); guac_log_error("Could not get GUAC_CLIENT_ARGS in plugin: %s\n", error);
guac_send_error(io, "Invalid server-side client plugin."); guac_send_error(io, "Invalid server-side client plugin.");
guac_flush(io); guac_flush(io);
guac_close(io); guac_close(io);
@ -397,6 +397,8 @@ int guac_start_client(guac_client* client) {
} }
if (pthread_create(&input_thread, NULL, __guac_client_input_thread, (void*) client)) { if (pthread_create(&input_thread, NULL, __guac_client_input_thread, (void*) client)) {
guac_client_stop(client);
pthread_join(output_thread, NULL);
return -1; return -1;
} }