fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2026-05-08 19:28:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't try to remove watches that have already been removed

Browse source 
This prevents some assertions from getting thrown by the
client under some circumstances
This commit is contained in:
Ray Strode 2008-08-06 22:22:55 -04:00
parent 6a96ca6ef4
commit 53688a686f
1 changed files with 34 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/client/ply-boot-client.c
View file

@ -104,9 +104,14 @@ ply_boot_client_cancel_unsent_requests (ply_boot_client_t *client)
node = next_node;
}
ply_event_loop_stop_watching_fd (client->loop,
client->daemon_can_take_request_watch);
client->daemon_can_take_request_watch = NULL;
if (client->daemon_can_take_request_watch != NULL)
{
assert (client->loop != NULL);
ply_event_loop_stop_watching_fd (client->loop,
client->daemon_can_take_request_watch);
client->daemon_can_take_request_watch = NULL;
}
}
static void
@ -132,9 +137,14 @@ ply_boot_client_cancel_requests_waiting_for_replies (ply_boot_client_t *client)
node = next_node;
}
ply_event_loop_stop_watching_fd (client->loop,
client->daemon_has_reply_watch);
client->daemon_has_reply_watch = NULL;
if (client->daemon_has_reply_watch != NULL)
{
assert (client->loop != NULL);
ply_event_loop_stop_watching_fd (client->loop,
client->daemon_has_reply_watch);
client->daemon_has_reply_watch = NULL;
}
}
static void
@ -288,9 +298,13 @@ out:
if (ply_list_get_length (client->requests_waiting_for_replies) == 0)
{
ply_event_loop_stop_watching_fd (client->loop,
client->daemon_has_reply_watch);
client->daemon_has_reply_watch = NULL;
if (client->daemon_has_reply_watch != NULL)
{
assert (client->loop != NULL);
ply_event_loop_stop_watching_fd (client->loop,
client->daemon_has_reply_watch);
client->daemon_has_reply_watch = NULL;
}
}
}
@ -379,9 +393,14 @@ ply_boot_client_process_pending_requests (ply_boot_client_t *client)
if (ply_list_get_length (client->requests_to_send) == 0)
{
ply_event_loop_stop_watching_fd (client->loop,
client->daemon_can_take_request_watch);
client->daemon_can_take_request_watch = NULL;
if (client->daemon_has_reply_watch != NULL)
{
assert (client->loop != NULL);
ply_event_loop_stop_watching_fd (client->loop,
client->daemon_can_take_request_watch);
client->daemon_can_take_request_watch = NULL;
}
}
}
@ -534,7 +553,10 @@ static void
ply_boot_client_detach_from_event_loop (ply_boot_client_t *client)
{
assert (client != NULL);
ply_trace ("detaching from event loop");
client->loop = NULL;
client->daemon_can_take_request_watch = NULL;
client->daemon_has_reply_watch = NULL;
}
static void