From 8ff071bf04c489ef75a5f01a3428ec1c09a1d430 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Thu, 13 Aug 2015 16:38:28 -0700 Subject: [PATCH] Fix botched merge conflict resolution. --- src/protocols/rdp/client.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/protocols/rdp/client.c b/src/protocols/rdp/client.c index b83baec4..ab2c104f 100644 --- a/src/protocols/rdp/client.c +++ b/src/protocols/rdp/client.c @@ -309,7 +309,8 @@ BOOL rdp_freerdp_pre_connect(freerdp* instance) { /* Allocate 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 */ if (client->file_handler == NULL)