Merge pull request #1320 from SaberUK/master+autoperm

Automatically apply +P to all permanent channels.

2 files changed, 4 insertions, 1 deletions

diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
index 835e31795..33da80c56 100644
--- a/docs/conf/modules.conf.example
+++ b/docs/conf/modules.conf.example
@@ -1434,7 +1434,6 @@
 #<include file="permchannels.conf">
 #
 # You may also create channels on startup by using the <permchannels> block.
-# Don't forget to set them +P in the modes, or they won't stay permanent.
 #<permchannels channel="#opers" modes="isP" topic="Opers only.">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp
index 9e77bd60e..d514e62a5 100644
--- a/src/modules/m_permchannels.cpp
+++ b/src/modules/m_permchannels.cpp
@@ -244,6 +244,10 @@ public:
 						mode->OnModeChange(ServerInstance->FakeClient, ServerInstance->FakeClient, c, par, true);
 					}
 				}
+
+				// We always apply the permchannels mode to permanent channels.
+				par.clear();
+				p.OnModeChange(ServerInstance->FakeClient, ServerInstance->FakeClient, c, par, true);
 			}
 		}
 	}