X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Fnntp%2Fnntplistener.cpp;h=a34fc15bb15f6eba8448092455b132ddbe911655;hp=04fa1e1757507b60c8ed9ed43dbc39b860e543eb;hb=59a5414ec47a2932a7802fcd1d98c4d80166564f;hpb=4e96d123460d6363cf7274e36bd9357768eb86ad

diff --git a/src/nntp/nntplistener.cpp b/src/nntp/nntplistener.cpp
index 04fa1e1..a34fc15 100644
--- a/src/nntp/nntplistener.cpp
+++ b/src/nntp/nntplistener.cpp
@@ -40,6 +40,8 @@ void NNTPListener::run()
 
 	m_log->debug("NNTPListener::run thread started.");
 
+	LoadDatabase();
+
 	StartListen();
 
 	do
@@ -104,19 +106,22 @@ void NNTPListener::run()
 void NNTPListener::StartListen()
 {
 	
-	std::string bindaddresses;
 	std::vector<std::string> listenaddresses;
+	std::string bindaddresses;	
 	std::string nntpport;
-	if(Option::Instance()->Get("NNTPListenPort",nntpport)==false)
+	Option option(m_db);
+
+	if(option.Get("NNTPListenPort",nntpport)==false)
 	{
 		nntpport="1119";
-		Option::Instance()->Set("NNTPListenPort",nntpport);
+		option.Set("NNTPListenPort",nntpport);
 	}
-	if(Option::Instance()->Get("NNTPBindAddresses",bindaddresses)==false)
+	if(option.Get("NNTPBindAddresses",bindaddresses)==false)
 	{
 		bindaddresses="127.0.0.1";
-		Option::Instance()->Set("NNTPBindAddresses",bindaddresses);
+		option.Set("NNTPBindAddresses",bindaddresses);
 	}
+
 	StringFunctions::Split(bindaddresses,",",listenaddresses);
 	
 	for(std::vector<std::string>::iterator i=listenaddresses.begin(); i!=listenaddresses.end(); i++)