summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2015-12-10 16:22:54 +0100
committerDavid Henningsson <david.henningsson@canonical.com>2015-12-18 13:33:19 +0100
commit04eb8157533d0ff71cd2a35e8957e43f3e49da83 (patch)
treea9f0b4b7385fc3932dd343bd62671997b7719caa
parentfc803b48830d9b800531c992464614f3e2c5ced7 (diff)
downloadpulseaudio-04eb8157533d0ff71cd2a35e8957e43f3e49da83.tar.gz
context: continue without srbchannel if it fails
We might be compiled without eventfd support, or something else might go wrong. And it's fully possible to continue using the old channel rather than just disconnecting. Signed-off-by: Pierre Ossman <ossman@cendio.se>
-rw-r--r--src/pulse/context.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/pulse/context.c b/src/pulse/context.c
index 738ea84ff..4f084e845 100644
--- a/src/pulse/context.c
+++ b/src/pulse/context.c
@@ -364,7 +364,11 @@ static void handle_srbchannel_memblock(pa_context *c, pa_memblock *memblock) {
pa_memblock_ref(memblock);
sr = pa_srbchannel_new_from_template(c->mainloop, &c->srb_template);
if (!sr) {
- pa_context_fail(c, PA_ERR_PROTOCOL);
+ pa_log_warn("Failed to create srbchannel from template");
+ c->srb_template.readfd = -1;
+ c->srb_template.writefd = -1;
+ pa_memblock_unref(c->srb_template.memblock);
+ c->srb_template.memblock = NULL;
return;
}