version 0.3.5

diff --git a/include/global.h b/include/global.h
index ce732de..13fa70c 100644 (file)
--- a/include/global.h
+++ b/include/global.h
@@ -7,7 +7,7 @@
 \r
 #define VERSION_MAJOR          "0"\r
 #define VERSION_MINOR          "3"\r
-#define VERSION_RELEASE                "4"\r
+#define VERSION_RELEASE                "5"\r
 #define FMS_VERSION                    VERSION_MAJOR"."VERSION_MINOR"."VERSION_RELEASE\r
 \r
 typedef Poco::ScopedLock<Poco::FastMutex> Guard;\r

diff --git a/src/fmsapp.cpp b/src/fmsapp.cpp
index 99712c5..3182443 100644 (file)
--- a/src/fmsapp.cpp
+++ b/src/fmsapp.cpp
@@ -172,6 +172,11 @@ int FMSApp::main(const std::vector<std::string> &args)
 \r
                waitForTerminationRequest();\r
 \r
+               if(isInteractive()==true)\r
+               {\r
+                       std::cout << "Please wait while FMS shuts down." << std::endl << std::endl;\r
+               }\r
+\r
                logger().trace("FMSApp::main cancelling threads");\r
                m_threads.Cancel();\r
                logger().trace("FMSApp::main joining threads");\r
@@ -231,6 +236,10 @@ void FMSApp::StartThreads()
                logger().trace("FMSApp::StartThreads starting HTTPThread");\r
                m_threads.Start(new HTTPThread());\r
        }\r
+       else\r
+       {\r
+               logger().trace("FMSApp::StartThreads not starting HTTPThread");\r
+       }\r
 \r
        tempval="";\r
        Option::Instance()->Get("StartNNTP",tempval);\r
@@ -239,6 +248,10 @@ void FMSApp::StartThreads()
                logger().trace("FMSApp::StartThreads starting NNTPListener");\r
                m_threads.Start(new NNTPListener());\r
        }\r
+       else\r
+       {\r
+               logger().trace("FMSApp::StartThreads not starting NNTPListener");\r
+       }\r
 \r
        tempval="";\r
        Option::Instance()->Get("StartFreenetUpdater",tempval);\r
@@ -247,5 +260,9 @@ void FMSApp::StartThreads()
                logger().trace("FMSApp::StartThreads starting FreenetMasterThread");\r
                m_threads.Start(new FreenetMasterThread());\r
        }\r
+       else\r
+       {\r
+               logger().trace("FMSApp::StartThreads not starting FreenetMasterThread");\r
+       }\r
 \r
 }\r

diff --git a/src/optionssetup.cpp b/src/optionssetup.cpp
index b0bf701..25de886 100644 (file)
--- a/src/optionssetup.cpp
+++ b/src/optionssetup.cpp
@@ -70,6 +70,7 @@ void SetupDefaultOptions()
        st.Bind(0,"FMSVersionEdition");\r
        st.Bind(1,"3");\r
        st.Step();\r
+       st.Reset();\r
        upd.Bind(0,"Program");\r
        upd.Bind(1,order++);\r
        upd.Bind(2);\r