From: Peter Powell <petpow@saberuk.com>
Date: Wed, 31 Jul 2019 20:25:44 +0000 (+0100)
Subject: Stop removing oper modes after a user have been quit network-wide.
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=ef77989a9d067de7a51fcfae16df82f390ff5bb5;p=user%2Fhenk%2Fcode%2Finspircd.git

Stop removing oper modes after a user have been quit network-wide.

Fixes #1686.
---

diff --git a/src/users.cpp b/src/users.cpp
index 37e381485..cfdd1f0b5 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -441,6 +441,13 @@ void User::UnOper()
 	 */
 	oper = NULL;
 
+	// Remove the user from the oper list
+	stdalgo::vector::swaperase(ServerInstance->Users->all_opers, this);
+
+	// If the user is quitting we shouldn't remove any modes as it results in
+	// mode messages being broadcast across the network.
+	if (quitting)
+		return;
 
 	/* Remove all oper only modes from the user when the deoper - Bug #466*/
 	Modes::ChangeList changelist;
@@ -454,9 +461,6 @@ void User::UnOper()
 
 	ServerInstance->Modes->Process(this, NULL, this, changelist);
 
-	// Remove the user from the oper list
-	stdalgo::vector::swaperase(ServerInstance->Users->all_opers, this);
-
 	ModeHandler* opermh = ServerInstance->Modes->FindMode('o', MODETYPE_USER);
 	if (opermh)
 		this->SetMode(opermh, false);