Branch merge

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10933 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
w00t 2009-01-02 18:45:12 +00:00
parent 43847ec9c7
commit 0aac6a2b2a

View File

@ -516,7 +516,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
/* Windows can (and defaults to) hide file extensions, so let's play a bit nice for windows users. */
std::string txtconf = this->ConfigFileName;
txtconf.append(".txt");
if (ServerConfig::FileExists(txtconf.c_str()))
{
strlcat(this->ConfigFileName, ".txt", MAXBUF);