X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Ffreenet%2Ffmsversionrequester.cpp;h=0d72722a6ef3485aeb5178781c0538096790fa91;hp=39fb02769b634a29bb8c80fc96b42771c9d859ed;hb=59a5414ec47a2932a7802fcd1d98c4d80166564f;hpb=4e96d123460d6363cf7274e36bd9357768eb86ad

diff --git a/src/freenet/fmsversionrequester.cpp b/src/freenet/fmsversionrequester.cpp
index 39fb027..0d72722 100644
--- a/src/freenet/fmsversionrequester.cpp
+++ b/src/freenet/fmsversionrequester.cpp
@@ -6,12 +6,12 @@
 #include <Poco/Timestamp.h>
 #include <Poco/Timespan.h>
 
-FMSVersionRequester::FMSVersionRequester()
+FMSVersionRequester::FMSVersionRequester(SQLite3DB::DB *db):IDatabase(db)
 {
 	Initialize();
 }
 
-FMSVersionRequester::FMSVersionRequester(FCPv2::Connection *fcp):IFCPConnected(fcp)
+FMSVersionRequester::FMSVersionRequester(SQLite3DB::DB *db, FCPv2::Connection *fcp):IDatabase(db),IFCPConnected(fcp)
 {
 	Initialize();
 }
@@ -42,7 +42,8 @@ const bool FMSVersionRequester::HandleAllData(FCPv2::Message &message)
 	if(parts.size()>2)
 	{
 		std::string editionstr=parts[2];
-		Option::Instance()->Set("FMSVersionEdition",editionstr);
+		Option option(m_db);
+		option.Set("FMSVersionEdition",editionstr);
 	}
 
 	// parse file into xml and update the database
@@ -80,7 +81,8 @@ const bool FMSVersionRequester::HandleGetFailed(FCPv2::Message &message)
 		if(parts.size()>2)
 		{
 			std::string editionstr=parts[2];
-			Option::Instance()->Set("FMSVersionEdition",editionstr);
+			Option option(m_db);
+			option.Set("FMSVersionEdition",editionstr);
 		}
 		m_log->debug("FMSVersionRequester::HandleGetFailed Fatal GetFailed for "+message["Identifier"]);
 	}
@@ -152,8 +154,9 @@ void FMSVersionRequester::StartRequest()
 	std::string editionstr="0";
 	int edition=0;
 	
-	Option::Instance()->Get("FMSVersionKey",key);
-	if(Option::Instance()->Get("FMSVersionEdition",editionstr))
+	Option option(m_db);
+	option.Get("FMSVersionKey",key);
+	if(option.Get("FMSVersionEdition",editionstr))
 	{
 		StringFunctions::Convert(editionstr,edition);
 		edition++;