diff src/plugins/plugin_misc_room_game.py @ 1257:83ed877541e3

plugin misc_room_game, radiocol, tarot: fixes bridge method "prepareRoom" declaration (add "async=True")
author souliane <souliane@mailoo.org>
date Wed, 22 Oct 2014 14:38:20 +0200
parents 301b342c697a
children 83127a4c89ce
line wrap: on
line diff
--- a/src/plugins/plugin_misc_room_game.py	Wed Oct 22 14:16:01 2014 +0200
+++ b/src/plugins/plugin_misc_room_game.py	Wed Oct 22 14:38:20 2014 +0200
@@ -407,7 +407,7 @@
         profile = self.host.memory.getProfileName(profile_key)
         if not profile:
             log.error(_("Unknown profile"))
-            return
+            return defer.succeed(None)
         if other_players is None:
             other_players = []
 
@@ -419,11 +419,11 @@
         if room_jid_s is not None and room_jid_s != "":  # a room name has been specified
             if room_jid_s in self.host.plugins["XEP-0045"].clients[profile].joined_rooms:
                 roomJoined(self.host.plugins["XEP-0045"].clients[profile].joined_rooms[room_jid_s])
-                return
+                return defer.succeed(None)
         else:
             room_jid_s = self.getUniqueName(profile_key=profile_key)
             if room_jid_s == "":
-                return
+                return defer.succeed(None)
         user_jid = self.host.getJidNStream(profile)[0]
         d = self.host.plugins["XEP-0045"].join(JID(room_jid_s), user_jid.user, {}, profile)
         return d.addCallback(roomJoined)