OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'hotfixes-v0.6.0a'

pull/44/head v0.6.0b
Mark Haines 2014-12-29 14:01:07 +00:00
parent 407c299828 af61c29527
commit 90d60e3fe4
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
synapse/media/v1/base_resource.py
View File

@ -139,6 +139,7 @@ class BaseMediaResource(Resource):
@download.addBoth @download.addBoth
def callback(media_info): def callback(media_info):
del self.downloads[key] del self.downloads[key]
return media_info
return download return download
@defer.inlineCallbacks @defer.inlineCallbacks