projects
/
srvx.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
36ea6f8
)
src/hash.c: Move irc_join() before callback handling for uniformity with other servers.
author
Michael Poole
<mdpoole@troilus.org>
Thu, 20 Mar 2008 03:42:20 +0000
(23:42 -0400)
committer
Michael Poole
<mdpoole@troilus.org>
Thu, 20 Mar 2008 03:42:20 +0000
(23:42 -0400)
src/hash.c
patch
|
blob
|
history
diff --git
a/src/hash.c
b/src/hash.c
index 4fa1e913f11e93826aaddf309516464bf8b011a9..c5aa49e0655b65c3c7f0c4b7ef724f3853146226 100644
(file)
--- a/
src/hash.c
+++ b/
src/hash.c
@@
-498,6
+498,10
@@
AddChannelUser(struct userNode *user, struct chanNode* channel)
&& !(channel->modes & MODE_APASS))
mNode->modes |= MODE_CHANOP;
&& !(channel->modes & MODE_APASS))
mNode->modes |= MODE_CHANOP;
+ if (IsLocal(user)) {
+ irc_join(user, channel);
+ }
+
for (n=0; n<jf_used; n++) {
/* Callbacks return true if they kick or kill the user,
* and we can continue without removing mNode. */
for (n=0; n<jf_used; n++) {
/* Callbacks return true if they kick or kill the user,
* and we can continue without removing mNode. */
@@
-505,9
+509,6
@@
AddChannelUser(struct userNode *user, struct chanNode* channel)
return NULL;
}
return NULL;
}
- if (IsLocal(user))
- irc_join(user, channel);
-
return mNode;
}
return mNode;
}