From 155efa9e363be149c199312fc9876d482471aa67 Mon Sep 17 00:00:00 2001 From: Amber Brown Date: Sat, 16 Feb 2019 05:10:48 +1100 Subject: [PATCH] fix --- synapse/rest/client/v2_alpha/register.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py index 739c06eaca..91c0d5e981 100644 --- a/synapse/rest/client/v2_alpha/register.py +++ b/synapse/rest/client/v2_alpha/register.py @@ -672,16 +672,19 @@ class RegisterRestServlet(RestServlet): }) defer.returnValue(result) + @defer.inlineCallbacks def _check_device_registered(self, user_id, device_id, initial_display_name): if self.hs.config.worker_app: - return self._device_check_registered_client( - user_id, device_id, initial_display_name - )["device_id"] - else: - return self.device_handler.check_device_registered( + r = yield self._device_check_registered_client( user_id, device_id, initial_display_name ) + defer.returnValue(r["device_id"]) + else: + r = yield self.device_handler.check_device_registered( + user_id, device_id, initial_display_name + ) + defer.returnValue(r) def _register_device(self, user_id, params): """Register a device for a user.