diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-12-29 13:54:05 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-12-29 13:54:05 +0000 |
| commit | af61c295272d299414d609aa7f7e55c7b07189e8 (patch) | |
| tree | 1cae0236f88583205ad60c9c9e3fd7e301c37d7d /synapse/media/v1/base_resource.py | |
| parent | Merge branch 'hotfixes-v0.6.0' (diff) | |
| download | synapse-af61c295272d299414d609aa7f7e55c7b07189e8.tar.xz | |
Return the argument passed to the callback in a deferred callback, otherwise twisted will replace the deferred result with 'None'
Diffstat (limited to 'synapse/media/v1/base_resource.py')
| -rw-r--r-- | synapse/media/v1/base_resource.py | 1 |
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 |