configure.ac: Replace AM_CONFIG_HEADER deprecated macro

[ncmpc.git] / src / filelist.c

diff --git a/src/filelist.c b/src/filelist.c
index 46b9a1c8d82820d263be67aaee84a119d4b7a0fd..91e569192b9bbda416356b32ed1b74ffe161d1a7 100644 (file)
--- a/src/filelist.c
+++ b/src/filelist.c
@@ -1,5 +1,5 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
  
  * This program is free software; you can redistribute it and/or modify
@@ -139,15 +139,11 @@ filelist_sort_dir_play(struct filelist *filelist, GCompareFunc compare_func)
 
        if (filelist->entries->len < 2)
                return;
+
+       /* If the first entry is NULL, skip it, because NULL stands for "[..]" */
        iter = ((struct filelist_entry*) g_ptr_array_index(filelist->entries, 0))->entity;
-       /* This can only happen at the beginning of the filelist,
-        * because NULL stands for "[..]" */
-       if (iter == NULL) {
-               iter = ((struct filelist_entry*) g_ptr_array_index(filelist->entries, 1))->entity;
-               first = 1;
-       }
-       else
-               first = 0;
+       first = (iter == NULL)? 1 : 0;
+
        /* find the last directory entry */
        for (last = first+1; last < filelist->entries->len; last++) {
                iter = ((struct filelist_entry*) g_ptr_array_index(filelist->entries, last))->entity;