diff options
| author | Erik Johnston <erik@matrix.org> | 2014-12-16 18:35:46 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-12-16 18:35:46 +0000 |
| commit | f76269392b17d2dbabc85579300d9eef9a559d4e (patch) | |
| tree | 94036377e17568e6983d6aeb2a73b827a277a580 /synapse/media/v1/base_resource.py | |
| parent | Use is_outlier() so that we don't get AttributeError (diff) | |
| parent | Merge branch 'release-v0.6.0' into develop (diff) | |
| download | synapse-f76269392b17d2dbabc85579300d9eef9a559d4e.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.6.0
Conflicts: synapse/state.py
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 14735ff375..2f5440ab64 100644 --- a/synapse/media/v1/base_resource.py +++ b/synapse/media/v1/base_resource.py @@ -135,6 +135,7 @@ class BaseMediaResource(Resource): if download is None: download = self._get_remote_media_impl(server_name, media_id) self.downloads[key] = download + @download.addBoth def callback(media_info): del self.downloads[key] |