From 2728cfb2265c4a0054746039c0616d6532460a1c Mon Sep 17 00:00:00 2001 From: Jens Georg Date: Tue, 6 Aug 2013 10:43:50 +0200 Subject: [PATCH] server: Dequeue item upon manual removal If the client creates an object in DLNA.ORG_AnyContainer but doesn't upload anything to it and then removes it within the 35s timeout, the ObjectRemovalQueue would still trigger and cause criticals. This change just tries to dequeue everything we remove to fix this. https://bugzilla.gnome.org/show_bug.cgi?id=702633 --- src/librygel-server/rygel-item-destroyer.vala | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/librygel-server/rygel-item-destroyer.vala b/src/librygel-server/rygel-item-destroyer.vala index ba42f2e..846fd2a 100644 --- a/src/librygel-server/rygel-item-destroyer.vala +++ b/src/librygel-server/rygel-item-destroyer.vala @@ -91,6 +91,8 @@ internal class Rygel.ItemDestroyer: GLib.Object, Rygel.StateMachine { } else { yield parent.remove_container (this.object_id, this.cancellable); } + + ObjectRemovalQueue.get_default ().dequeue (media_object); } private async MediaObject fetch_object () throws Error { -- 2.7.4