screen_file: always set new list_window length

[ncmpc.git] / src / screen_file.c

diff --git a/src/screen_file.c b/src/screen_file.c
index f7b3b567e4110a750c6ffb123e7211cc079ff73c..1387cee519fc066f0bc96bf0b02d8627de5d187c 100644 (file)
--- a/src/screen_file.c
+++ b/src/screen_file.c
@@ -21,6 +21,7 @@
 #include "screen_browser.h"
 #include "screen_interface.h"
 #include "screen_message.h"
+#include "screen_queue.h"
 #include "screen.h"
 #include "config.h"
 #include "i18n.h"
@@ -28,7 +29,6 @@
 #include "mpdclient.h"
 #include "filelist.h"
 #include "screen_utils.h"
-#include "screen_play.h"
 #include "screen_client.h"
 
 #include <mpd/client.h>
@@ -52,31 +52,36 @@ screen_file_repaint(void)
 }
 
 static void
-screen_file_reload(struct mpdclient *c)
+screen_file_load_list(struct mpdclient *c, struct filelist *filelist)
 {
        struct mpd_connection *connection;
 
-       if (browser.filelist != NULL)
-               filelist_free(browser.filelist);
-
-       browser.filelist = filelist_new();
-       if (*current_path != 0)
-               /* add a dummy entry for ./.. */
-               filelist_append(browser.filelist, NULL);
-
        if (!mpdclient_is_connected(c))
                return;
 
        connection = mpdclient_get_connection(c);
 
        mpd_send_list_meta(connection, current_path);
-       filelist_recv(browser.filelist, connection);
+       filelist_recv(filelist, connection);
 
        if (mpd_response_finish(connection))
-               filelist_sort_dir_play(browser.filelist,
-                                      compare_filelist_entry_path);
+               filelist_sort_dir_play(filelist, compare_filelist_entry_path);
        else
                mpdclient_handle_error(c);
+}
+
+static void
+screen_file_reload(struct mpdclient *c)
+{
+       if (browser.filelist != NULL)
+               filelist_free(browser.filelist);
+
+       browser.filelist = filelist_new();
+       if (*current_path != 0)
+               /* add a dummy entry for ./.. */
+               filelist_append(browser.filelist, NULL);
+
+       screen_file_load_list(c, browser.filelist);
 
        list_window_set_length(browser.lw,
                               filelist_length(browser.filelist));
@@ -308,7 +313,7 @@ screen_file_get_title(char *str, size_t size)
 static void
 screen_file_paint(void)
 {
-       list_window_paint(browser.lw, browser_lw_callback, browser.filelist);
+       screen_browser_paint(&browser);
 }
 
 static void