From 1a3ba00c246803ee06a680060454fb6782e5dd7d Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Thu, 23 Dec 2010 21:56:06 -0500
Subject: [PATCH] Fixed noexpire channels expiring

---
 src/chanserv.cpp | 2 +-
 src/misc.cpp     | 2 +-
 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;
 }
 
 /*************************************************************************/