From f1426e02ee3477e31ab462a83690c3eb328d2bf4 Mon Sep 17 00:00:00 2001
From: Bram Matthys <syzop@vulnscan.org>
Date: Sat, 17 Oct 2015 11:11:55 +0200
Subject: [PATCH] Fix channel mode +P (Permanent) not working if you have
 set::modes-on-join, reported by blank (#4426).

---
 src/modules/m_join.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/modules/m_join.c b/src/modules/m_join.c
index bec93a12a..bebf34895 100644
--- a/src/modules/m_join.c
+++ b/src/modules/m_join.c
@@ -272,6 +272,7 @@ DLLFUNC void _join_channel(aChannel *chptr, aClient *cptr, aClient *sptr, int fl
 			}
 #endif
 		}
+
 		if (chptr->topic)
 		{
 			sendto_one(sptr, rpl_str(RPL_TOPIC),
@@ -281,7 +282,13 @@ DLLFUNC void _join_channel(aChannel *chptr, aClient *cptr, aClient *sptr, int fl
 			    sptr->name, chptr->chname, chptr->topic_nick,
 			    chptr->topic_time);
 		}
-		if (chptr->users == 1 && (MODES_ON_JOIN || iConf.modes_on_join.extmodes))
+		
+		/* Set default channel modes (set::modes-on-join).
+		 * Set only if it's the 1st user and only if no other modes have been set
+		 * already (eg: +P, permanent).
+		 */
+		if ((chptr->users == 1) && !chptr->mode.mode && !chptr->mode.extmode &&
+		    (MODES_ON_JOIN || iConf.modes_on_join.extmodes))
 		{
 			int i;
 			chptr->mode.extmode =  iConf.modes_on_join.extmodes;
@@ -303,9 +310,11 @@ DLLFUNC void _join_channel(aChannel *chptr, aClient *cptr, aClient *sptr, int fl
 			    me.name, chptr->chname, modebuf, parabuf, chptr->creationtime);
 			sendto_one(sptr, ":%s MODE %s %s %s", me.name, chptr->chname, modebuf, parabuf);
 		}
+
 		parv[0] = sptr->name;
 		parv[1] = chptr->chname;
 		(void)do_cmd(cptr, sptr, "NAMES", 2, parv);
+
 		RunHook4(HOOKTYPE_LOCAL_JOIN, cptr, sptr,chptr,parv);
 	} else {
 		RunHook4(HOOKTYPE_REMOTE_JOIN, cptr, sptr, chptr, parv); /* (rarely used) */