From bcd85ca68281b8f10d4357d6f7daeced4b79a9b4 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 8 Apr 2013 01:05:25 -0500 Subject: [PATCH] Fix OperType::GetCommands --- src/opertype.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/opertype.cpp b/src/opertype.cpp index b8412205d..eb73c20f4 100644 --- a/src/opertype.cpp +++ b/src/opertype.cpp @@ -95,7 +95,8 @@ const Anope::string &OperType::GetName() const void OperType::Inherits(OperType *ot) { - this->inheritances.insert(ot); + if (ot != this) + this->inheritances.insert(ot); } const std::list OperType::GetCommands() const @@ -104,7 +105,7 @@ const std::list OperType::GetCommands() const for (std::set::const_iterator it = this->inheritances.begin(), it_end = this->inheritances.end(); it != it_end; ++it) { OperType *ot = *it; - std::list cmds = ot->GetPrivs(); + std::list cmds = ot->GetCommands(); for (std::list::const_iterator it2 = cmds.begin(), it2_end = cmds.end(); it2 != it2_end; ++it2) cmd_list.push_back(*it2); }