From da8db6c34090edd0a78513fd16eb017500347174 Mon Sep 17 00:00:00 2001
From: Daniel De Graaf
Date: Tue, 9 Feb 2010 15:00:24 -0600
Subject: Fixes from characterless mode test

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

(limited to 'src/channels.cpp')

diff --git a/src/channels.cpp b/src/channels.cpp
index eee55ef7d..c3556cc8f 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -724,7 +724,6 @@ char* Channel::ChanModes(bool showkey)
 	static char scratch[MAXBUF];
 	static char sparam[MAXBUF];
 	char* offset = scratch;
-	std::string extparam;
 
 	*scratch = '\0';
 	*sparam = '\0';
@@ -735,10 +734,10 @@ char* Channel::ChanModes(bool showkey)
 		ModeHandler* mh = ServerInstance->Modes->FindMode(id);
 		if (!mh)
 			continue;
-		char mc = mh->GetModeChar();
-		if (IsModeSet(id))
+		if (IsModeSet(mh))
 		{
-			extparam.clear();
+			char mc = mh->GetModeChar();
+			std::string extparam;
 			*offset++ = mc ? mc : 'Z';
 			if (mc == 'k' && !showkey)
 			{
-- 
cgit v1.3.1-10-gc9f91