From 9fe15c5988f3eea038a4f495566fb1c26be1d1cd Mon Sep 17 00:00:00 2001
From: attilamolnar <attilamolnar@hush.com>
Date: Thu, 26 Jul 2012 17:52:13 +0200
Subject: m_ojoin Fix giving +Y only instead of +Yo when <ojoin:op> is on and
 the user is already in the channel

---
 src/modules/m_ojoin.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp
index fcb267750..e16fe3588 100644
--- a/src/modules/m_ojoin.cpp
+++ b/src/modules/m_ojoin.cpp
@@ -87,8 +87,10 @@ class CommandOjoin : public Command
 			// they're already in the channel
 			std::vector<std::string> modes;
 			modes.push_back(parameters[0]);
-			modes.push_back("+Y");
+			modes.push_back(op ? "+Yo" : "+Y");
 			modes.push_back(user->nick);
+			if (op)
+				modes.push_back(user->nick);
 			ServerInstance->SendGlobalMode(modes, ServerInstance->FakeClient);
 		}
 		return CMD_SUCCESS;
-- 
cgit v1.2.3