X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=8a769ceb1d067a22cb29ae2a1e6517c32f9479e5;hb=9a2481ebf1109adc4b626414108d92674793cd5d;hp=6271213fd2a0f08452fbc5259d477b8dcaf5c2b8;hpb=23fb1f062bc993bdce30f643b905105fd2f1b78e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules.cpp b/src/modules.cpp
index 6271213fd..8a769ceb1 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -251,7 +251,7 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s,
 	 * on which they want, and we make sure our module is *at least* before or after
 	 * the first or last of this subset, depending again on the type of priority.
 	 */
-	size_t swap_pos;
+	size_t swap_pos = 0;
 	size_t source = 0;
 	bool swap = true;
 	bool found = false;
@@ -823,8 +823,8 @@ ConfigReader::ConfigReader(InspIRCd* Instance, const std::string &filename) : Se
 	this->data = new ConfigDataHash;
 	this->privatehash = true;
 	this->errorlog = new std::ostringstream(std::stringstream::in | std::stringstream::out);
-	/*** XXX: Can return a 'not ready yet!' code! */
-	this->readerror = ServerInstance->Config->LoadConf(*this->data, filename, *this->errorlog);
+	/*** XXX: This might block! */
+	this->readerror = ServerInstance->Config->DoInclude(*this->data, filename, *this->errorlog);
 	if (!this->readerror)
 		this->error = CONF_FILE_NOT_FOUND;
 }