summaryrefslogtreecommitdiff
path: root/libnautilus-private/nautilus-column-utilities.c
diff options
context:
space:
mode:
authorWilliam Jon McCann <jmccann@redhat.com>2012-09-04 20:21:55 -0400
committerWilliam Jon McCann <jmccann@redhat.com>2012-09-05 14:34:40 -0400
commit185dad3c3ace1e6f11897b5e7c11d083a378785b (patch)
tree696e904d3af326a67bf24fadaf9df5118dfd74cd /libnautilus-private/nautilus-column-utilities.c
parent3416a818372aab6ad81c8b7ee3467802bc04c028 (diff)
downloadnautilus-185dad3c3ace1e6f11897b5e7c11d083a378785b.tar.gz
Don't crash if we can't load column preferences
https://bugzilla.gnome.org/show_bug.cgi?id=662131
Diffstat (limited to 'libnautilus-private/nautilus-column-utilities.c')
-rw-r--r--libnautilus-private/nautilus-column-utilities.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libnautilus-private/nautilus-column-utilities.c b/libnautilus-private/nautilus-column-utilities.c
index d328ab1f3..ea8aad27c 100644
--- a/libnautilus-private/nautilus-column-utilities.c
+++ b/libnautilus-private/nautilus-column-utilities.c
@@ -337,12 +337,12 @@ GList *
nautilus_sort_columns (GList *columns,
char **column_order)
{
- if (!column_order) {
- return NULL;
+ if (column_order == NULL) {
+ return columns;
}
return g_list_sort_with_data (columns,
(GCompareDataFunc)column_compare,
column_order);
}
-
+