X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_list.cpp;h=278e6044d0e31fd2792d14a6ad89229849b0bbe6;hb=df9bd50866a1ee95db78b88090aae74e245ad469;hp=745f019f2274c518fe6e2f2df216bb25b1b9758b;hpb=d96e7e97f9036c5ce4cba10d917bf8a66e87654c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_list.cpp b/src/coremods/core_list.cpp
index 745f019f2..278e6044d 100644
--- a/src/coremods/core_list.cpp
+++ b/src/coremods/core_list.cpp
@@ -94,14 +94,15 @@ CmdResult CommandList::Handle (const std::vector<std::string>& parameters, User
 		// if the channel is not private/secret, OR the user is on the channel anyway
 		bool n = (has_privs || chan->HasUser(user));
 
-		if ((!n) && (chan->IsModeSet(privatemode)))
+		// If we're not in the channel and +s is set on it, we want to ignore it
+		if ((n) || (!chan->IsModeSet(secretmode)))
 		{
-			/* Channel is +p and user is outside/not privileged */
-			user->WriteNumeric(RPL_LIST, "* %ld :", users);
-		}
-		else
-		{
-			if ((n) || (!chan->IsModeSet(secretmode)))
+			if ((!n) && (chan->IsModeSet(privatemode)))
+			{
+				// Channel is private (+p) and user is outside/not privileged
+				user->WriteNumeric(RPL_LIST, "* %ld :", users);
+			}
+			else
 			{
 				/* User is in the channel/privileged, channel is not +s */
 				user->WriteNumeric(RPL_LIST, "%s %ld :[+%s] %s", chan->name.c_str(), users, chan->ChanModes(n), chan->topic.c_str());