diff --git a/src/screen_client.c b/src/screen_client.c
index 9d60ed2cd6943cbd018653fdcc0bc4338d53ffc9..6eb9bf4964de2f2950a60ae021fd65346eac0a46 100644 (file)
--- a/src/screen_client.c
+++ b/src/screen_client.c
/* 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
#include "screen_client.h"
#include "screen_utils.h"
-#include "screen_message.h"
+#include "screen_status.h"
#include "mpdclient.h"
#include "i18n.h"
#include "charset.h"
static bool
_screen_auth(struct mpdclient *c, gint recursion)
{
- char *password;
+ struct mpd_connection *connection = mpdclient_get_connection(c);
+ if (connection == NULL)
+ return false;
- mpd_connection_clear_error(c->connection);
+ mpd_connection_clear_error(connection);
if (recursion > 2)
return false;
- password = screen_read_password(NULL);
+ char *password = screen_read_password(NULL);
if (password == NULL)
return false;
- mpd_send_password(c->connection, password);
+ mpd_send_password(connection, password);
g_free(password);
- mpd_response_finish(c->connection);
+ mpd_response_finish(connection);
mpdclient_update(c);
- if (mpd_connection_get_error(c->connection) == MPD_ERROR_SERVER &&
- mpd_connection_get_server_error(c->connection) == MPD_SERVER_ERROR_PASSWORD)
+ if (mpd_connection_get_error(connection) == MPD_ERROR_SERVER &&
+ mpd_connection_get_server_error(connection) == MPD_SERVER_ERROR_PASSWORD)
return _screen_auth(c, ++recursion);
return true;
void
screen_database_update(struct mpdclient *c, const char *path)
{
- unsigned id;
-
assert(c != NULL);
assert(mpdclient_is_connected(c));
- id = mpd_run_update(c->connection, path);
+ struct mpd_connection *connection = mpdclient_get_connection(c);
+ if (connection == NULL)
+ return;
+
+ unsigned id = mpd_run_update(connection, path);
if (id == 0) {
- if (mpd_connection_get_error(c->connection) == MPD_ERROR_SERVER &&
- mpd_connection_get_server_error(c->connection) == MPD_SERVER_ERROR_UPDATE_ALREADY) {
+ if (mpd_connection_get_error(connection) == MPD_ERROR_SERVER &&
+ mpd_connection_get_server_error(connection) == MPD_SERVER_ERROR_UPDATE_ALREADY &&
+ mpd_connection_clear_error(connection))
screen_status_printf(_("Database update running..."));
- mpd_connection_clear_error(c->connection);
- } else
+ else
mpdclient_handle_error(c);
return;
}