summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-09-19 16:40:14 +0200
committerStefano Karapetsas <[email protected]>2013-09-19 16:40:14 +0200
commitacccd87b60837f610e1c4fd4d57937b9cb8e7bc4 (patch)
tree7fc203f6e13fbdd7e8323cc3bd75a1856c2d0ee7
parent47ac58d285ef6cd6076a54a3d2f12cb3208f8c36 (diff)
downloadcaja-acccd87b60837f610e1c4fd4d57937b9cb8e7bc4.tar.bz2
caja-acccd87b60837f610e1c4fd4d57937b9cb8e7bc4.tar.xz
Possible fix for crash during file rename in external devices
Bug report: https://bugzilla.redhat.com/show_bug.cgi?id=1005660 Solution from: https://git.gnome.org/browse/nautilus/commit/src/nautilus-icon-view.c?h=gnome-3-2&id=a67212a
-rw-r--r--src/file-manager/fm-icon-view.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index 888db702..6ab19c4e 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -2639,12 +2639,11 @@ fm_icon_view_icon_text_changed_callback (CajaIconContainer *container,
FMIconView *icon_view)
{
g_assert (CAJA_IS_FILE (file));
- g_assert (new_name != NULL);
/* Don't allow a rename with an empty string. Revert to original
* without notifying the user.
*/
- if (new_name[0] == '\0')
+ if ((new_name == NULL) || (new_name[0] == '\0'))
{
return;
}