summaryrefslogtreecommitdiff
path: root/modules/core
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2011-07-31 03:22:23 -0400
committerAdam <Adam@anope.org>2011-07-31 03:22:23 -0400
commit1cb11bba5dd36c2ac1f02e7b49c659de142ce481 (patch)
tree1650215b843b98fc64991f373b018dc0b238975c /modules/core
parentf29c88bcd535e6dcf3bbf453423bca4b697a60fc (diff)
Fixed a few small problems, including m_ssl's connect feature sometimes failing for no good reason
Diffstat (limited to 'modules/core')
-rw-r--r--modules/core/cs_register.cpp2
-rw-r--r--modules/core/cs_saset_noexpire.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/core/cs_register.cpp b/modules/core/cs_register.cpp
index 7f08828fc..117212519 100644
--- a/modules/core/cs_register.cpp
+++ b/modules/core/cs_register.cpp
@@ -143,7 +143,7 @@ class ExpireCallback : public CallBack
if (Config->CSSuspendExpire && Anope::CurTime - ci->last_used >= Config->CSSuspendExpire)
expire = true;
}
- else if (!ci->c && Anope::CurTime - ci->last_used >= Config->CSExpire)
+ else if (!ci->c && Config->CSExpire && Anope::CurTime - ci->last_used >= Config->CSExpire)
expire = true;
if (ci->HasFlag(CI_NO_EXPIRE))
diff --git a/modules/core/cs_saset_noexpire.cpp b/modules/core/cs_saset_noexpire.cpp
index 414b822a7..fa944f86a 100644
--- a/modules/core/cs_saset_noexpire.cpp
+++ b/modules/core/cs_saset_noexpire.cpp
@@ -19,7 +19,7 @@ class CommandCSSASetNoexpire : public Command
CommandCSSASetNoexpire(Module *creator) : Command(creator, "chanserv/saset/noexpire", 2, 2, "chanserv/saset/noexpire")
{
this->SetDesc(_("Prevent the channel from expiring"));
- this->SetDesc(_("\037channel\037 NOEXPIRE {ON | OFF}"));
+ this->SetDesc(_("\037channel\037 {ON | OFF}"));
}
void Execute(CommandSource &source, const std::vector<Anope::string> &params)