GUACAMOLE-474: Merge corrections to file upload/download build failures.

This commit is contained in:
Mike Jumper 2020-06-08 10:40:05 -07:00 committed by GitHub
commit 32723d229f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -116,11 +116,10 @@ void guac_rdpdr_fs_process_create(guac_rdp_common_svc* svc,
if (file != NULL && strcmp(file->absolute_path, "\\") == 0) { if (file != NULL && strcmp(file->absolute_path, "\\") == 0) {
/* Only create Download folder if downloads are enabled. */ /* Only create Download folder if downloads are enabled. */
if (!((guac_rdp_fs*) devices->data)->disable_download) { if (!((guac_rdp_fs*) device->data)->disable_download) {
int download_id = int download_id =
guac_rdp_fs_open((guac_rdp_fs*) device->data, "\\Download", guac_rdp_fs_open((guac_rdp_fs*) device->data, "\\Download",
GENERIC_READ, 0, FILE_OPEN_IF, FILE_DIRECTORY_FILE); GENERIC_READ, 0, FILE_OPEN_IF, FILE_DIRECTORY_FILE);
}
if (download_id >= 0) if (download_id >= 0)
guac_rdp_fs_close((guac_rdp_fs*) device->data, download_id); guac_rdp_fs_close((guac_rdp_fs*) device->data, download_id);
@ -128,6 +127,8 @@ void guac_rdpdr_fs_process_create(guac_rdp_common_svc* svc,
} }
}
guac_rdp_common_svc_write(svc, output_stream); guac_rdp_common_svc_write(svc, output_stream);
} }