summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndrej Holy <oholy@redhat.com>2022-01-17 15:50:08 +0100
committerOndrej Holy <oholy@redhat.com>2022-02-11 13:55:12 +0000
commit4953a1e25f640c54470e69b783a21d91774a6e21 (patch)
tree53d35a5aeab359179fe04a1461d8e04f8367a3fe
parent25e2263683f41f599a967d5a30c54842d15ab7ae (diff)
downloadnautilus-4953a1e25f640c54470e69b783a21d91774a6e21.tar.gz
file-operations: Call autoar_compressor_set_passphrase conditionally
The `autoar_compressor_set_passphrase` function is always called currently regardless the fact whether password is set, or not. Consequently, the "autoar_compressor_set_passphrase: assertion 'self->format == AUTOAR_FORMAT_ZIP' failed" critical is printed. Let's call that function only if the passphrase is really wanted. (cherry picked from commit 807ff3d77b68dd2fcd37ce488048f3c8518a3cfa)
-rw-r--r--src/nautilus-file-operations.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c
index 4e55e076f..5cb0128b1 100644
--- a/src/nautilus-file-operations.c
+++ b/src/nautilus-file-operations.c
@@ -9066,7 +9066,10 @@ compress_task_thread_func (GTask *task,
compress_job->format,
compress_job->filter,
FALSE);
- autoar_compressor_set_passphrase (compressor, compress_job->passphrase);
+ if (compress_job->passphrase && compress_job->passphrase[0] != '\0')
+ {
+ autoar_compressor_set_passphrase (compressor, compress_job->passphrase);
+ }
autoar_compressor_set_output_is_dest (compressor, TRUE);