diff options
author | Stefano Karapetsas <[email protected]> | 2013-09-22 15:02:58 +0200 |
---|---|---|
committer | Stefano Karapetsas <[email protected]> | 2013-09-22 15:02:58 +0200 |
commit | ddd554133d6362a692f1d2281053c06b94651039 (patch) | |
tree | 4b3c5261920c35b5113ffd8a649a83648dcaf3a8 /src/file-manager | |
parent | c79f320aba836847f35e5e465754b1ddd62806b4 (diff) | |
parent | 77bd50e13ed0e111a2e1f0c4313caf798d66e8d9 (diff) | |
download | caja-ddd554133d6362a692f1d2281053c06b94651039.tar.bz2 caja-ddd554133d6362a692f1d2281053c06b94651039.tar.xz |
Merge branch 'master' of github.com:mate-desktop/mate-file-manager
Diffstat (limited to 'src/file-manager')
-rw-r--r-- | src/file-manager/fm-icon-view.c | 3 |
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; } |