diff --git a/src/screen_queue.c b/src/screen_queue.c
index 1ee8c001dab4b43db898d40ffc43bb82bc2cfd2b..9b67592356bd89796d9922e47cbcddc81dfbaa83 100644 (file)
--- a/src/screen_queue.c
+++ b/src/screen_queue.c
#include "screen_queue.h"
#include "screen_interface.h"
#include "screen_file.h"
-#include "screen_message.h"
+#include "screen_status.h"
#include "screen_find.h"
#include "config.h"
#include "i18n.h"
filename=g_strstrip(filename);
} else
#endif
- filename=g_strdup(name);
+ filename=g_strdup(name);
if (filename == NULL)
return -1;
/* send save command to mpd */
connection = mpdclient_get_connection(c);
- if (connection == NULL)
+ if (connection == NULL) {
+ g_free(filename);
return -1;
+ }
filename_utf8 = locale_to_utf8(filename);
if (!mpd_run_save(connection, filename_utf8)) {
mpd_connection_get_server_error(connection) == MPD_SERVER_ERROR_EXIST &&
mpd_connection_clear_error(connection)) {
char *buf;
- int key;
+ bool replace;
buf = g_strdup_printf(_("Replace %s [%s/%s] ? "),
filename, YES, NO);
- key = tolower(screen_getch(buf));
+ replace = screen_get_yesno(buf, false);
g_free(buf);
- if (key != YES[0]) {
+ if (!replace) {
g_free(filename_utf8);
g_free(filename);
screen_status_printf(_("Aborted"));
{
if (c->events & MPD_IDLE_QUEUE)
screen_queue_restore_selection();
+ else
+ /* the queue size may have changed, even if we havn't
+ received the QUEUE idle event yet */
+ list_window_set_length(lw, playlist_length(playlist));
if (((c->events & MPD_IDLE_PLAYER) != 0 &&
screen_queue_song_change(c->status)) ||
case CMD_SHUFFLE:
list_window_get_range(lw, &range);
- if (range.end < range.start + 1)
+ if (range.end <= range.start + 1)
/* No range selection, shuffle all list. */
break;
lw->selected--;
lw->range_base--;
+ if (lw->range_selection)
+ list_window_scroll_to(lw, lw->range_base);
+ list_window_scroll_to(lw, lw->selected);
+
screen_queue_save_selection();
return true;
lw->selected++;
lw->range_base++;
+ if (lw->range_selection)
+ list_window_scroll_to(lw, lw->range_base);
+ list_window_scroll_to(lw, lw->selected);
+
screen_queue_save_selection();
return true;