From: SomeDude <SomeDude@NuBL7aaJ6Cn4fB7GXFb9Zfi8w1FhPyW3oKgU9TweZMw>
Date: Fri, 4 Jul 2008 17:07:00 +0000 (+0200)
Subject: version 0.3.5
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=cd97061e86eeecf5b77dea35f0549e73a50eb200;p=fms.git

version 0.3.5
---

diff --git a/include/global.h b/include/global.h
index ce732de..13fa70c 100644
--- a/include/global.h
+++ b/include/global.h
@@ -7,7 +7,7 @@
 
 #define VERSION_MAJOR		"0"
 #define VERSION_MINOR		"3"
-#define VERSION_RELEASE		"4"
+#define VERSION_RELEASE		"5"
 #define FMS_VERSION			VERSION_MAJOR"."VERSION_MINOR"."VERSION_RELEASE
 
 typedef Poco::ScopedLock<Poco::FastMutex> Guard;
diff --git a/src/fmsapp.cpp b/src/fmsapp.cpp
index 99712c5..3182443 100644
--- a/src/fmsapp.cpp
+++ b/src/fmsapp.cpp
@@ -172,6 +172,11 @@ int FMSApp::main(const std::vector<std::string> &args)
 
 		waitForTerminationRequest();
 
+		if(isInteractive()==true)
+		{
+			std::cout << "Please wait while FMS shuts down." << std::endl << std::endl;
+		}
+
 		logger().trace("FMSApp::main cancelling threads");
 		m_threads.Cancel();
 		logger().trace("FMSApp::main joining threads");
@@ -231,6 +236,10 @@ void FMSApp::StartThreads()
 		logger().trace("FMSApp::StartThreads starting HTTPThread");
 		m_threads.Start(new HTTPThread());
 	}
+	else
+	{
+		logger().trace("FMSApp::StartThreads not starting HTTPThread");
+	}
 
 	tempval="";
 	Option::Instance()->Get("StartNNTP",tempval);
@@ -239,6 +248,10 @@ void FMSApp::StartThreads()
 		logger().trace("FMSApp::StartThreads starting NNTPListener");
 		m_threads.Start(new NNTPListener());
 	}
+	else
+	{
+		logger().trace("FMSApp::StartThreads not starting NNTPListener");
+	}
 
 	tempval="";
 	Option::Instance()->Get("StartFreenetUpdater",tempval);
@@ -247,5 +260,9 @@ void FMSApp::StartThreads()
 		logger().trace("FMSApp::StartThreads starting FreenetMasterThread");
 		m_threads.Start(new FreenetMasterThread());
 	}
+	else
+	{
+		logger().trace("FMSApp::StartThreads not starting FreenetMasterThread");
+	}
 
 }
diff --git a/src/optionssetup.cpp b/src/optionssetup.cpp
index b0bf701..25de886 100644
--- a/src/optionssetup.cpp
+++ b/src/optionssetup.cpp
@@ -70,6 +70,7 @@ void SetupDefaultOptions()
 	st.Bind(0,"FMSVersionEdition");
 	st.Bind(1,"3");
 	st.Step();
+	st.Reset();
 	upd.Bind(0,"Program");
 	upd.Bind(1,order++);
 	upd.Bind(2);