From 18c0cb00ddace621a7066415e4a630831229127b Mon Sep 17 00:00:00 2001 From: Packit Service Date: Jan 08 2021 06:13:08 +0000 Subject: Apply patch 0005-file-operations-Don-t-crash-if-source-file-not-prese.patch patch_name: 0005-file-operations-Don-t-crash-if-source-file-not-prese.patch present_in_specfile: true location_in_specfile: 5 --- diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c index 4d84b98..cf5e7f4 100644 --- a/src/nautilus-file-operations.c +++ b/src/nautilus-file-operations.c @@ -7324,20 +7324,18 @@ retry: { g_autofree char *filename2 = NULL; g_autofree char *suffix = NULL; - NautilusFile *file; - file = nautilus_file_get (job->src); - if (nautilus_file_is_directory (file)) - { - filename_base = filename; - } - else + filename_base = filename; + if (job->src != NULL) { - filename_base = eel_filename_strip_extension (filename); + g_autoptr (NautilusFile) file = NULL; + file = nautilus_file_get (job->src); + if (!nautilus_file_is_directory (file)) + { + filename_base = eel_filename_strip_extension (filename); + } } - nautilus_file_unref (file); - offset = strlen (filename_base); suffix = g_strdup (filename + offset); @@ -7377,21 +7375,21 @@ retry: { g_autofree char *suffix = NULL; g_autofree gchar *filename2 = NULL; - NautilusFile *file; g_clear_object (&dest); - file = nautilus_file_get (job->src); - if (nautilus_file_is_directory (file)) - { - filename_base = filename; - } - else + filename_base = filename; + if (job->src != NULL) { - filename_base = eel_filename_strip_extension (filename); + g_autoptr (NautilusFile) file = NULL; + + file = nautilus_file_get (job->src); + if (!nautilus_file_is_directory (file)) + { + filename_base = eel_filename_strip_extension (filename); + } } - nautilus_file_unref (file); offset = strlen (filename_base); suffix = g_strdup (filename + offset);