diff --git a/src/gidle.c b/src/gidle.c
index 6f149a5292cb3b3f3b7624c55427914ff1532b8b..415fb17f005fbbacdfc90d9f4662b50709695309 100644 (file)
--- a/src/gidle.c
+++ b/src/gidle.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
Redistribution and use in source and binary forms, with or without
* flag is set, mpd_glib_enter() is a no-op to prevent this.
*/
bool leaving;
+
+ /**
+ * This flag is true when mpd_glib_free() has been called
+ * during a callback invoked from mpd_glib_leave().
+ * mpd_glib_leave() will do the real g_free() call then.
+ */
+ bool destroyed;
};
struct mpd_glib_source *
source->io_events = 0;
source->id = 0;
source->leaving = false;
+ source->destroyed = false;
return source;
}
void
mpd_glib_free(struct mpd_glib_source *source)
{
+ assert(!source->destroyed);
+
if (source->id != 0)
g_source_remove(source->id);
g_io_channel_unref(source->channel);
+
+ mpd_parser_free(source->parser);
+
+ if (source->leaving)
+ source->destroyed = true;
+ else
+ g_free(source);
}
static void
mpd_glib_invoke(const struct mpd_glib_source *source)
{
assert(source->id == 0);
+ assert(!source->destroyed);
if (source->idle_events != 0)
source->callback(MPD_ERROR_SUCCESS, 0, NULL,
const char *message)
{
assert(source->id == 0);
+ assert(!source->destroyed);
source->callback(error, server_error, message,
0, source->callback_ctx);
source->io_events = events;
}
-void
+bool
mpd_glib_enter(struct mpd_glib_source *source)
{
bool success;
assert(source->io_events == 0);
assert(source->id == 0);
+ assert(!source->destroyed);
if (source->leaving)
- return;
+ return false;
source->idle_events = 0;
success = mpd_async_send_command(source->async, "idle", NULL);
if (!success) {
mpd_glib_invoke_async_error(source);
- return;
+ return false;
}
mpd_glib_add_watch(source);
+ return true;
}
-void
+bool
mpd_glib_leave(struct mpd_glib_source *source)
{
enum mpd_idle events;
+ assert(!source->destroyed);
+
if (source->id == 0)
/* already left, callback was invoked */
- return;
+ return true;
g_source_remove(source->id);
source->id = 0;
mpd_glib_invoke_error(source, error, server_error,
mpd_connection_get_error_message(source->connection));
+
+ if (source->destroyed) {
+ g_free(source);
+ return false;
+ }
+
source->leaving = false;
- return;
+ return true;
}
source->idle_events |= events;
mpd_glib_invoke(source);
+ if (source->destroyed) {
+ g_free(source);
+ return false;
+ }
+
source->leaving = false;
+ return true;
}