From 1a8bbd600498d6ac00906e130950d75e6ccd3148 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Tue, 12 Mar 2024 14:34:34 +0000 Subject: Respect --noexpire in cs_suspend and ns_suspend. --- modules/commands/cs_suspend.cpp | 4 ++-- modules/commands/ns_suspend.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/commands/cs_suspend.cpp b/modules/commands/cs_suspend.cpp index ae050e1c6..c9274c059 100644 --- a/modules/commands/cs_suspend.cpp +++ b/modules/commands/cs_suspend.cpp @@ -262,7 +262,7 @@ class CSSuspend : public Module expire = false; - if (si->expires && si->expires < Anope::CurTime) + if (!Anope::NoExpire && si->expires && si->expires < Anope::CurTime) { ci->last_used = Anope::CurTime; Expire(ci); @@ -278,7 +278,7 @@ class CSSuspend : public Module if (!si) return EVENT_CONTINUE; - if (si->expires && si->expires < Anope::CurTime) + if (!Anope::NoExpire && si->expires && si->expires < Anope::CurTime) { Expire(c->ci); return EVENT_CONTINUE; diff --git a/modules/commands/ns_suspend.cpp b/modules/commands/ns_suspend.cpp index fc445a1dc..0d801ab7d 100644 --- a/modules/commands/ns_suspend.cpp +++ b/modules/commands/ns_suspend.cpp @@ -268,7 +268,7 @@ class NSSuspend : public Module expire = false; - if (s->expires && s->expires < Anope::CurTime) + if (!Anope::NoExpire && s->expires && s->expires < Anope::CurTime) { na->last_seen = Anope::CurTime; Expire(na); @@ -281,7 +281,7 @@ class NSSuspend : public Module if (!s) return EVENT_CONTINUE; - if (s->expires && s->expires < Anope::CurTime) + if (!Anope::NoExpire && s->expires && s->expires < Anope::CurTime) { Expire(na); return EVENT_CONTINUE; -- cgit