aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-05-22 12:20:22 +0100
committerMatthew Wild <mwild1@gmail.com>2010-05-22 12:20:22 +0100
commit41d45e0c64b94de227f048d5f376699dd6041735 (patch)
treecf2f36b43ebaeb24f0397a6597ed63e6658cbc96
parentc1257c7435697f4ed47c823ac0ebc8f676f1c773 (diff)
downloadprosody-41d45e0c64b94de227f048d5f376699dd6041735.tar.gz
prosody-41d45e0c64b94de227f048d5f376699dd6041735.zip
rostermanager: Don't fire roster-load event if there was an error loading the roster
-rw-r--r--core/rostermanager.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/rostermanager.lua b/core/rostermanager.lua
index a8eb806c..a3315245 100644
--- a/core/rostermanager.lua
+++ b/core/rostermanager.lua
@@ -101,7 +101,9 @@ function load_roster(username, host)
roster[jid] = nil;
log("warn", "roster for "..jid.." has a self-contact");
end
- hosts[host].events.fire_event("roster-load", username, host, roster);
+ if not err then
+ hosts[host].events.fire_event("roster-load", username, host, roster);
+ end
return roster, err;
end