From: Jeremy Kerr Date: Sun, 1 Feb 2009 05:28:38 +0000 (+1100) Subject: [discover client] Remove device from discover array before notifying UI X-Git-Tag: v1.0.0~918 X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=5e53907420e5600b7f4cfb51bcd270ec52c5462f [discover client] Remove device from discover array before notifying UI Signed-off-by: Jeremy Kerr --- diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c index 7c2e27d..ff0ab40 100644 --- a/ui/common/discover-client.c +++ b/ui/common/discover-client.c @@ -107,10 +107,6 @@ static void remove_device(struct discover_client *client, const char *id) if (!device) return; - client->ops.remove_device(device, client->ops.cb_arg); - - talloc_free(device); - /* remove the device from the client's device array */ client->n_devices--; memmove(&client->devices[i], &client->devices[i+1], @@ -118,6 +114,10 @@ static void remove_device(struct discover_client *client, const char *id) client->devices = talloc_realloc(client, client->devices, struct device *, client->n_devices); + /* notify the UI */ + client->ops.remove_device(device, client->ops.cb_arg); + + talloc_free(device); } int discover_client_process(struct discover_client *client)