Correctly ignore commented out includes

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6108 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 3 insertions, 2 deletions

diff --git a/.inspircd.inc b/.inspircd.inc
index e2c8c787c..71eb3a754 100644
--- a/.inspircd.inc
+++ b/.inspircd.inc
@@ -231,7 +231,8 @@ sub getpidfile {
   my $tmp = join("",@lines);
 
   # Does this file have a pid?
-  if (($tmp =~ /<pid file=\"(\S+)\">/i) && ($tmp !~ /^#/)) {
+  if (($tmp =~ /<pid file=\"(\S+)\">/i) && ($tmp !~ /^#/))
+  {
     # Set the PID file and return.
     $pidfile = $1;
     return;
@@ -240,7 +241,7 @@ sub getpidfile {
   # If we get here, NO PID FILE! -- Check for includes (Seeing as we will eventually return,
   # The while (1) is safe.)
   while (1) {
-    if ($tmp =~ s/\<include file=\"(.+?)\"\>//i)
+    if (($tmp =~ s/\<include file=\"(.+?)\"\>//i) && ($tmp !~ /^#/))
     {
       # Decend into that file, and check for PIDs.. (that sounds like an STD ;/)
       getpidfile($1);