X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=312e78aa697eba498385fd4a6cd48ebc3319e730;hb=b83765d756c2568d15b87654963b5237d0482367;hp=4d68af99cf1d45a6a00dbaf8f389924db4bf3722;hpb=8b864c8a828d6ca97b5ec15fa7bf8fcc35027294;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/channels.cpp b/src/channels.cpp
index 4d68af99c..312e78aa6 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -482,6 +482,7 @@ long chanrec::PartUser(userrec *user, const char* reason)
 			}
 			user->chans[i]->uc_modes = 0;
 			user->chans[i]->channel = NULL;
+			this->RemoveAllPrefixes(user);
 			break;
 		}
 	}
@@ -528,6 +529,7 @@ long chanrec::ServerKickUser(userrec* user, const char* reason, bool triggereven
 			this->WriteChannelWithServ(ServerInstance->Config->ServerName, "KICK %s %s :%s", this->name, user->nick, reason);
 			user->chans[i]->uc_modes = 0;
 			user->chans[i]->channel = NULL;
+			this->RemoveAllPrefixes(user);
 			break;
 		}
 	}
@@ -610,6 +612,7 @@ long chanrec::KickUser(userrec *src, userrec *user, const char* reason)
 			this->WriteChannel(src, "KICK %s %s :%s", this->name, user->nick, reason);
 			(*i)->uc_modes = 0;
 			(*i)->channel = NULL;
+			this->RemoveAllPrefixes(user);
 			break;
 		}
 	}
@@ -976,3 +979,10 @@ void chanrec::SetPrefix(userrec* user, char prefix, unsigned int prefix_value, b
 	}
 }
 
+void chanrec::RemoveAllPrefixes(userrec* user)
+{
+	prefixlist::iterator n = prefixes.find(user);
+	if (n != prefixes.end())
+		prefixes.erase(n);
+}
+