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

Fix botched merge conflict resolution.

Browse Source
This commit is contained in:
Michael Jumper 2015-08-13 16:38:28 -07:00
parent 48bbc6a898
commit 8ff071bf04
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -309,7 +309,8 @@ BOOL rdp_freerdp_pre_connect(freerdp* instance) {
/* Allocate filesystem */ /* Allocate filesystem */
guac_client_data->filesystem = guac_client_data->filesystem =
guac_rdp_fs_alloc(client, guac_client_data->settings.drive_path); guac_rdp_fs_alloc(client, guac_client_data->settings.drive_path,
guac_client_data->settings.create_drive_path);
/* Use for basic uploads if no other handler set */ /* Use for basic uploads if no other handler set */
if (client->file_handler == NULL) if (client->file_handler == NULL)