From 9b4c0e79d8725cc4fec8b2c780d1bb5b51941a86 Mon Sep 17 00:00:00 2001
From: Mathieu Velten <mathieuv@matrix.org>
Date: Wed, 3 Aug 2022 16:24:44 +0200
Subject: Adress comments

---
 synapse/events/third_party_rules.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'synapse')

diff --git a/synapse/events/third_party_rules.py b/synapse/events/third_party_rules.py
index 490acd657a..e438f712fd 100644
--- a/synapse/events/third_party_rules.py
+++ b/synapse/events/third_party_rules.py
@@ -554,19 +554,18 @@ class ThirdPartyEventRules:
             was raised at some point.
         """
 
-        global_changed = True
+        global_changed = False
         for callback in self._on_threepid_unbind_callbacks:
             try:
                 (changed, stop) = await callback(
                     user_id, medium, address, identity_server
                 )
-                global_changed &= changed
+                global_changed |= changed
                 if stop:
-                    return (global_changed, True)
+                    return global_changed, True
             except Exception as e:
                 logger.exception(
                     "Failed to run module API callback %s: %s", callback, e
                 )
-                raise e
 
-        return (global_changed, False)
+        return global_changed, False
-- 
cgit 1.5.1