From af61c295272d299414d609aa7f7e55c7b07189e8 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Mon, 29 Dec 2014 13:54:05 +0000
Subject: [PATCH] Return the argument passed to the callback in a deferred
 callback, otherwise twisted will replace the deferred result with 'None'

---
 synapse/media/v1/base_resource.py | 1 +
 1 file changed, 1 insertion(+)

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