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

Do not commit settings until actually set.

Browse Source
This commit is contained in:
Michael Jumper 2013-07-18 17:26:07 -07:00
parent 59e90b7c63
commit 07538d1b10
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/protocols/rdp/client.c
View File

@ -483,9 +483,6 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
guac_client_data->settings.printing_enabled = guac_client_data->settings.printing_enabled =
(strcmp(argv[IDX_ENABLE_PRINTING], "true") == 0); (strcmp(argv[IDX_ENABLE_PRINTING], "true") == 0);
/* Commit settings */
guac_rdp_commit_settings(settings, rdp_inst->settings);
/* Store client data */ /* Store client data */
guac_client_data->rdp_inst = rdp_inst; guac_client_data->rdp_inst = rdp_inst;
guac_client_data->bounded = FALSE; guac_client_data->bounded = FALSE;
@ -555,6 +552,9 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
/* Load keymap into client */ /* Load keymap into client */
__guac_rdp_client_load_keymap(client, settings->server_layout); __guac_rdp_client_load_keymap(client, settings->server_layout);
/* Commit settings */
guac_rdp_commit_settings(settings, rdp_inst->settings);
/* Connect to RDP server */ /* Connect to RDP server */
if (!freerdp_connect(rdp_inst)) { if (!freerdp_connect(rdp_inst)) {