summaryrefslogtreecommitdiff
path: root/src/configreader.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/configreader.cpp')
-rw-r--r--src/configreader.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/configreader.cpp b/src/configreader.cpp
index d2a7ccfd4..be2b52ae1 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -1336,6 +1336,8 @@ int ServerConfig::DoDownloads()
CompletedFiles[x->first] = true;
}
+ ServerInstance->Logs->Log("CONFIG",DEBUG,"Returning %d from DoDownloads()", new_downloads);
+
return new_downloads;
}
@@ -1398,7 +1400,10 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
if (!scan_for_includes_only)
{
if (x->second)
+ {
+ ServerInstance->Logs->Log("CONFIG",DEBUG,"Retrieve conf");
conf = IncludedFiles.find(filename)->second;
+ }
else
{
errorstream << "File " << filename << " could not be opened." << std::endl;
@@ -1408,6 +1413,9 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
}
}
+ if (!conf)
+ return false;
+
ServerInstance->Logs->Log("CONFIG",DEBUG,"Start to read conf %s %08lx", filename, conf);
/* Start reading characters... */