First part of charybdis changeset 1393:da0c7fdb7ee1

diff --git a/modules/core/m_join.c b/modules/core/m_join.c
index 67360befe0d70f87e94143a0cb93d42ae62ba61f..94b13293f28130556b8a196e571c145f526d69fe 100644 (file)
--- a/modules/core/m_join.c
+++ b/modules/core/m_join.c
@@ -232,6 +232,9 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *
                                        source_p->servptr->name,
                                        chptr->chname, modebuf, parabuf);
                *omodebuf = *modebuf = *parabuf = '\0';
+
+               /* since we're dropping our modes, we want to clear the mlock as well. --nenolod */
+               set_channel_mlock(client_p, source_p, chptr, NULL, FALSE);
        }
 
        if(!IsMember(source_p, chptr))
@@ -493,6 +496,9 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
                /* Update capitalization in channel name, this makes the
                 * capitalization timestamped like modes are -- jilles */
                strcpy(chptr->chname, parv[2]);
+
+               /* since we're dropping our modes, we want to clear the mlock as well. --nenolod */
+               set_channel_mlock(client_p, source_p, chptr, NULL, FALSE);
        }
 
        if(*modebuf != '\0')