diff --git a/src/screen_file.c b/src/screen_file.c
index 1387cee519fc066f0bc96bf0b02d8627de5d187c..25a86d1bb8f0c0ca8d75f5746818fe361b9d8d4a 100644 (file)
--- a/src/screen_file.c
+++ b/src/screen_file.c
{
struct mpd_connection *connection;
- if (!mpdclient_is_connected(c))
- return;
-
connection = mpdclient_get_connection(c);
+ if (connection == NULL)
+ return;
mpd_send_list_meta(connection, current_path);
filelist_recv(filelist, connection);
screen_file_reload(c);
-#ifndef NCMPC_MINI
screen_browser_sync_highlights(browser.filelist, &c->playlist);
-#endif
list_window_reset(browser.lw);
return change_to_entry(c, entry);
}
-static int
+static void
handle_save(struct mpdclient *c)
{
struct list_window_range range;
const char *defaultname = NULL;
char *defaultname_utf8 = NULL;
- int ret;
list_window_get_range(browser.lw, &range);
if (range.start == range.end)
- return -1;
+ return;
for (unsigned i = range.start; i < range.end; ++i) {
struct filelist_entry *entry =
if(defaultname)
defaultname_utf8 = utf8_to_locale(defaultname);
- ret = playlist_save(c, NULL, defaultname_utf8);
+ playlist_save(c, NULL, defaultname_utf8);
g_free(defaultname_utf8);
-
- return ret;
}
-static int
+static void
handle_delete(struct mpdclient *c)
{
struct mpd_connection *connection = mpdclient_get_connection(c);
char *str, *buf;
int key;
+ if (connection == NULL)
+ return;
+
list_window_get_range(browser.lw, &range);
for (unsigned i = range.start; i < range.end; ++i) {
struct filelist_entry *entry =
if( key != YES[0] ) {
/* translators: a dialog was aborted by the user */
screen_status_printf(_("Aborted"));
- return 0;
+ return;
}
if (!mpd_run_rm(connection, mpd_playlist_get_path(playlist))) {
user */
screen_status_printf(_("Playlist deleted"));
}
- return 0;
}
static void
screen_file_open(struct mpdclient *c)
{
screen_file_reload(c);
+ screen_browser_sync_highlights(browser.filelist, &c->playlist);
}
static const char *
screen_file_reload(c);
}
-#ifndef NCMPC_MINI
- if (c->events & (MPD_IDLE_DATABASE | MPD_IDLE_STORED_PLAYLIST |
- MPD_IDLE_PLAYLIST))
- screen_browser_sync_highlights(browser.filelist, &c->playlist);
-#endif
-
if (c->events & (MPD_IDLE_DATABASE | MPD_IDLE_STORED_PLAYLIST
#ifndef NCMPC_MINI
| MPD_IDLE_PLAYLIST
#endif
- ))
+ )) {
+ screen_browser_sync_highlights(browser.filelist, &c->playlist);
screen_file_repaint();
+ }
}
static bool
case CMD_SCREEN_UPDATE:
screen_file_reload(c);
-#ifndef NCMPC_MINI
screen_browser_sync_highlights(browser.filelist, &c->playlist);
-#endif
screen_file_repaint();
return false;