rename screen_message to screen_status

[ncmpc.git] / src / screen_outputs.c

diff --git a/src/screen_outputs.c b/src/screen_outputs.c
index 4a5b2f4cdaf4d9a24d2396ff26a6d0e59f6271ed..98c4d9cbe5db08d507e8085d6e6a299e6fb4d5e4 100644 (file)
--- a/src/screen_outputs.c
+++ b/src/screen_outputs.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
@@ -19,7 +19,7 @@
 
 #include "screen_outputs.h"
 #include "screen_interface.h"
-#include "screen_message.h"
+#include "screen_status.h"
 #include "paint.h"
 #include "i18n.h"
 #include "list_window.h"
@@ -104,7 +104,11 @@ clear_outputs_list(void)
 
        g_ptr_array_foreach(mpd_outputs, clear_output_element, NULL);
        g_ptr_array_remove_range(mpd_outputs, 0, mpd_outputs->len);
-       list_window_set_length(lw, 0);
+
+       /* not updating the list_window length here, because that
+          would clear the cursor position, and fill_outputs_list()
+          will be called after this function anyway */
+       /* list_window_set_length(lw, 0); */
 }
 
 static void
@@ -116,8 +120,10 @@ fill_outputs_list(struct mpdclient *c)
        assert(mpd_outputs != NULL);
 
        connection = mpdclient_get_connection(c);
-       if (connection == NULL)
+       if (connection == NULL) {
+               list_window_set_length(lw, 0);
                return;
+       }
 
        mpd_send_outputs(connection);
        while ((output = mpd_recv_output(connection)) != NULL) {
@@ -239,7 +245,7 @@ const struct screen_functions screen_outputs = {
        .close     = outputs_close,
        .resize    = outputs_resize,
        .paint     = outputs_paint,
-       .update = screen_outputs_update,
+       .update    = screen_outputs_update,
        .cmd       = outputs_cmd,
        .get_title = outputs_title,
 };