[discover client] Remove device from discover array before notifying UI

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c
index 7c2e27daa777a4ddbb8cb4e4063b090c70e8cc52..ff0ab4031928155ce8ed35038b435ca022feb6a8 100644 (file)
--- 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;
 
        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],
        /* 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);
 
        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)
 }
 
 int discover_client_process(struct discover_client *client)