summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-08-14 00:53:16 +0200
committerLennart Poettering <lennart@poettering.net>2008-08-14 00:53:16 +0200
commitb9d17d64d5bfcd49164c6cf703134a063b7ad020 (patch)
treebbb687a76239fcaecb9531ce61ac10bbdf41424b
parent4a528e7bdc3c55a0fea67ade89ce4cae7a434c9a (diff)
don't assert existance of event id in properties
-rw-r--r--src/common.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/common.c b/src/common.c
index ce2ffb3..78e6c81 100644
--- a/src/common.c
+++ b/src/common.c
@@ -528,7 +528,9 @@ int ca_context_play_full(ca_context *c, uint32_t id, ca_proplist *p, ca_finish_c
ca_mutex_lock(c->mutex);
ca_return_val_if_fail_unlock(ca_proplist_contains(p, CA_PROP_EVENT_ID) ||
- ca_proplist_contains(c->props, CA_PROP_EVENT_ID), CA_ERROR_INVALID, c->mutex);
+ ca_proplist_contains(c->props, CA_PROP_EVENT_ID) ||
+ ca_proplist_contains(p, CA_PROP_MEDIA_FILENAME) ||
+ ca_proplist_contains(c->props, CA_PROP_MEDIA_FILENAME), CA_ERROR_INVALID, c->mutex);
ca_mutex_lock(c->props->mutex);
if ((t = ca_proplist_gets_unlocked(c->props, CA_PROP_CANBERRA_ENABLE)))