From ede5d4f612fed4462893aa8c2f67c44e9ec07b25 Mon Sep 17 00:00:00 2001
From: Peter Powell
Date: Mon, 21 Oct 2019 12:21:11 +0100
Subject: Fire the OnSetUserIP event after the connect class change.

---
 src/users.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/users.cpp')

diff --git a/src/users.cpp b/src/users.cpp
index 69483ac92..69def5154 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -758,17 +758,16 @@ void LocalUser::SetClientIP(const irc::sockets::sockaddrs& sa)
 		return;
 
 	ServerInstance->Users->RemoveCloneCounts(this);
-
 	User::SetClientIP(sa);
-
-	FOREACH_MOD(OnSetUserIP, (this));
-
 	ServerInstance->Users->AddClone(this);
 
 	// Recheck the connect class.
 	this->MyClass = NULL;
 	this->SetClass();
 	this->CheckClass();
+
+	if (!quitting)
+		FOREACH_MOD(OnSetUserIP, (this));
 }
 
 void LocalUser::Write(const ClientProtocol::SerializedMessage& text)
-- 
cgit v1.3.1-10-gc9f91