diff --git a/src/screen_queue.c b/src/screen_queue.c
index 863c3dd5f38442e6e432a58d90d8038321869acb..50e70c4a51ddcb3a321db52455cdb3d2f9afc440 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;
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"));
screen_queue_restore_selection();
else
/* the queue size may have changed, even if we havn't
- revceived the QUEUE idle event yet */
+ received the QUEUE idle event yet */
list_window_set_length(lw, playlist_length(playlist));
if (((c->events & MPD_IDLE_PLAYER) != 0 &&
break;
#endif
case CMD_SCREEN_SWAP:
- screen_swap(c, playlist_get(&c->playlist, lw->selected));
+ if (playlist_length(&c->playlist) > 0)
+ screen_swap(c, playlist_get(&c->playlist, lw->selected));
+ else
+ screen_swap(c, NULL);
return true;
default:
if (!mpdclient_cmd_move(c, range.end - 1, range.start - 1))
return true;
- list_window_move_cursor(lw, lw->selected - 1);
+ 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;
if (!mpdclient_cmd_move(c, range.start, range.end))
return true;
- list_window_move_cursor(lw, lw->selected + 1);
+ 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;