colin/wireplumber
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

registry: safely destroy proxy when its initial augment is still in progress

Browse Source 
... in case the global is removed from the registry before
the initial augment completes
This commit is contained in:
George Kiagiadakis
2020-02-14 16:37:28 +02:00
parent 269b9e1998
commit 813351bcdf
3 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/wp/object-manager.c
View File

@@ -525,6 +525,7 @@ wp_global_rm_flag (WpGlobal *global, guint rm_flag)
if (global->flags == 0 && global->proxy) {
if (reg)
wp_registry_notify_rm_object (reg, global->proxy);
wp_proxy_destroy (global->proxy);
g_clear_object (&global->proxy);
}
}
@@ -902,10 +903,16 @@ static void
on_proxy_ready (GObject * proxy, GAsyncResult * res, gpointer data)
{
g_autoptr (WpObjectManager) self = WP_OBJECT_MANAGER (data);
g_autoptr (GError) error = NULL;
g_ptr_array_add (self->objects, proxy);
g_signal_emit (self, signals[SIGNAL_OBJECT_ADDED], 0, proxy);
schedule_emit_objects_changed (self);
if (wp_proxy_augment_finish (WP_PROXY (proxy), res, &error)) {
g_ptr_array_add (self->objects, proxy);
g_signal_emit (self, signals[SIGNAL_OBJECT_ADDED], 0, proxy);
schedule_emit_objects_changed (self);
} else {
g_message ("WpObjectManager:%p proxy augment failed: %s", self,
error->message);
}
}
static void