summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2010-12-23 21:56:06 -0500
committerAdam <Adam@anope.org>2010-12-23 21:56:06 -0500
commit1a3ba00c246803ee06a680060454fb6782e5dd7d (patch)
tree6066e49cecf339effdc344aeae5b64a7f93ddf4e
parente8a207279298d009c0f1564ba58485611ddbc741 (diff)
Fixed noexpire channels expiring
-rw-r--r--src/chanserv.cpp2
-rw-r--r--src/misc.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/chanserv.cpp b/src/chanserv.cpp
index e3a8993b0..504bdea2a 100644
--- a/src/chanserv.cpp
+++ b/src/chanserv.cpp
@@ -376,7 +376,7 @@ void expire_chans()
expire = true;
if (ci->HasFlag(CI_NO_EXPIRE))
- expire = true;
+ expire = false;
if (expire)
{
diff --git a/src/misc.cpp b/src/misc.cpp
index 6aa90820e..97006469a 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -230,7 +230,7 @@ time_t dotime(const Anope::string &s)
}
catch (const CoreException &) { }
- return -1;
+ return 0;
}
/*************************************************************************/