summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-12-29 14:01:07 +0000
committerMark Haines <mark.haines@matrix.org>2014-12-29 14:01:07 +0000
commit90d60e3fe4f6738c98fde19a3477e0de406e06bf (patch)
tree0a137bf177f733a1c5f016b59619f529518a7271 /synapse
parentimprove error msg (diff)
parentReturn the argument passed to the callback in a deferred callback, otherwise ... (diff)
downloadsynapse-90d60e3fe4f6738c98fde19a3477e0de406e06bf.tar.xz
Merge branch 'hotfixes-v0.6.0a' v0.6.0b
Diffstat (limited to 'synapse')
-rw-r--r--synapse/media/v1/base_resource.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/media/v1/base_resource.py b/synapse/media/v1/base_resource.py
index 2f5440ab64..499be8cca0 100644
--- a/synapse/media/v1/base_resource.py
+++ b/synapse/media/v1/base_resource.py
@@ -139,6 +139,7 @@ class BaseMediaResource(Resource):
             @download.addBoth
             def callback(media_info):
                 del self.downloads[key]
+                return media_info
         return download
 
     @defer.inlineCallbacks