[Patches] [CVS] Module ircu2.10: Change committed

[Perry Lorier]

CVSROOT    : /cvsroot/undernet-ircu
Module     : ircu2.10
Branch tags: u2_10_11_05
Commit time: 2003-10-25 04:19:29 UTC

Modified files:
  Tag: u2_10_11_05
     ChangeLog ircd/channel.c

Log message:

Author: Entrope <[EMAIL PROTECTED]>
Log message:

        * ircd/channel.c: Move IsUserParting() test up so we do not
        send the part to other servers.

---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.290.2.128.2.38 ircu2.10/ChangeLog:1.290.2.128.2.39
--- ircu2.10/ChangeLog:1.290.2.128.2.38 Fri Oct 24 20:24:09 2003
+++ ircu2.10/ChangeLog  Fri Oct 24 21:19:18 2003
@@ -1,3 +1,7 @@
+2003-10-25  Entrope <[EMAIL PROTECTED]>
+        * ircd/channel.c: Move IsUserParting() test up so we do not
+        send the part to other servers.
+
 2003-10-24  Entrope <[EMAIL PROTECTED]>
         * include/channel.h: Add new flag to indicate a user is
         parting a channel.
Index: ircu2.10/ircd/channel.c
diff -u ircu2.10/ircd/channel.c:1.73.2.13.2.4 ircu2.10/ircd/channel.c:1.73.2.13.2.5
--- ircu2.10/ircd/channel.c:1.73.2.13.2.4       Fri Oct 24 20:24:09 2003
+++ ircu2.10/ircd/channel.c     Fri Oct 24 21:19:19 2003
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: channel.c,v 1.73.2.13.2.4 2003/10/25 03:24:09 isomer Exp $
+ * $Id: channel.c,v 1.73.2.13.2.5 2003/10/25 04:19:19 isomer Exp $
  */
 #include "config.h"
 
@@ -2685,6 +2685,11 @@
 
   if (jbuf->jb_type == JOINBUF_TYPE_PART ||
       jbuf->jb_type == JOINBUF_TYPE_PARTALL) {
+    struct Membership *member = find_member_link(chan, jbuf->jb_source);
+    if (IsUserParting(member))
+      return;
+    SetUserParting(member);
+
     /* Send notification to channel */
     if (!(flags & CHFL_ZOMBIE))
       sendcmdto_channel_butserv_butone(jbuf->jb_source, CMD_PART, chan, NULL,
@@ -2704,12 +2709,6 @@
     /* got to remove user here */
     if (jbuf->jb_type == JOINBUF_TYPE_PARTALL || is_local)
       remove_user_from_channel(jbuf->jb_source, chan);
-    else {
-      struct Membership *member = find_member_link(chan, jbuf->jb_source);
-      if (IsUserParting(member))
-        return;
-      SetUserParting(member);
-    }
   } else {
     /* Add user to channel */
     add_user_to_channel(chan, jbuf->jb_source, flags);
----------------------- End of diff -----------------------