server:

	all projects: corected cflafs/cxxflags
	modules:
		metadata_flat:
			fixed crash on non-existing setting check
client:
	enable ui only after events subscription to avid hypotetically not handled events

5 files changed, 13 insertions, 9 deletions

diff --git a/client-qt/udm-client-qt/udm_main.cpp b/client-qt/udm-client-qt/udm_main.cpp
index 5df22a7..830adfe 100644
--- a/client-qt/udm-client-qt/udm_main.cpp
+++ b/client-qt/udm-client-qt/udm_main.cpp
@@ -259,7 +259,7 @@ void udm_main::server_message_received(server_msg msg)
         if(msg.auth_reply().status())
         {
             auth_token = msg.auth_reply().auth_token();
-            btn_add->setEnabled(true); //we can add downloads now
+
             lbl_state->setText(tr("State") + ": " + tr("Connected") + ", " + tr("Authenticated"));
             //TODO: subscript to events
             //request modules and settings here
@@ -309,6 +309,7 @@ void udm_main::server_message_received(server_msg msg)
 
                 session->send_message(msg);
             }
+            btn_add->setEnabled(true); //we can add downloads now
         }
         else
         {
diff --git a/server/modules/downloaders/curl/curl.project b/server/modules/downloaders/curl/curl.project
index 51434a3..6a04772 100644
--- a/server/modules/downloaders/curl/curl.project
+++ b/server/modules/downloaders/curl/curl.project
@@ -47,7 +47,7 @@
       <ResourceCompiler Options=""/>
     </GlobalSettings>
     <Configuration Name="Debug" CompilerType="GCC" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
-      <Compiler Options="-std=c++11;-Wall;-g -Wall -fexceptions -fPIC -DBOOST_LOG_DYN_LINK" C_Options="-std=c++11;-std=c99;-Wall;-g -Wall -fexceptions -fPIC -DBOOST_LOG_DYN_LINK" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
+      <Compiler Options="-std=c++11;-Wall;-g -Wall -fexceptions -fPIC -DBOOST_LOG_DYN_LINK" C_Options="-std=c99;-Wall;-g -Wall -fexceptions -fPIC -DBOOST_LOG_DYN_LINK" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
         <IncludePath Value="include"/>
         <IncludePath Value="../../../include"/>
       </Compiler>
@@ -93,7 +93,7 @@
       </Completion>
     </Configuration>
     <Configuration Name="Release" CompilerType="GCC" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
-      <Compiler Options="-std=c++11 -O2 -Wall -fexceptions -fPIC -DBOOST_LOG_DYN_LINK " C_Options="-std=c++11 -O2 -Wall -fexceptions -fPIC -DBOOST_LOG_DYN_LINK " Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
+      <Compiler Options="-std=c++11 -O2 -Wall -fexceptions -fPIC -DBOOST_LOG_DYN_LINK " C_Options="-std=c99 -O2 -Wall -fexceptions -fPIC -DBOOST_LOG_DYN_LINK " Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
         <IncludePath Value="include"/>
         <IncludePath Value="../../../include"/>
       </Compiler>
diff --git a/server/modules/metadata/flat_files/main.cpp b/server/modules/metadata/flat_files/main.cpp
index f58f782..ec9d5a2 100644
--- a/server/modules/metadata/flat_files/main.cpp
+++ b/server/modules/metadata/flat_files/main.cpp
@@ -118,7 +118,7 @@ bool storage_impl::set(const std::string &module_name, const std::string &settin
 	}
 	else if(!boost::filesystem::is_directory(out_file_path))
 	{
-		//error
+		//TODO: handle error
 		return false;
 	}
 	out_file_path += "/";
@@ -169,9 +169,12 @@ std::list<std::string> storage_impl::setting_list(const std::string &module_name
 	std::string settings_dir = parsed_data_path;
 	settings_dir += "/";
 	settings_dir += module_name;
-	for(auto i = boost::filesystem::directory_iterator(settings_dir), end = boost::filesystem::directory_iterator(); i != end; ++i)
+	if(boost::filesystem::exists(settings_dir) && boost::filesystem::is_directory(settings_dir))
 	{
-		l.push_back(i->path().string().substr(settings_dir.length() + 1));
+		for(auto i = boost::filesystem::directory_iterator(settings_dir), end = boost::filesystem::directory_iterator(); i != end; ++i)
+		{
+			l.push_back(i->path().string().substr(settings_dir.length() + 1));
+		}
 	}
 	return l;
 }
diff --git a/server/modules/metadata/flat_files/module_metadata_flat_files.project b/server/modules/metadata/flat_files/module_metadata_flat_files.project
index 483431c..f4bf3ce 100644
--- a/server/modules/metadata/flat_files/module_metadata_flat_files.project
+++ b/server/modules/metadata/flat_files/module_metadata_flat_files.project
@@ -36,7 +36,7 @@
       <ResourceCompiler Options=""/>
     </GlobalSettings>
     <Configuration Name="Debug" CompilerType="GCC" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
-      <Compiler Options="-std=c++11;-Wall;-g -Wall -fexceptions -fPIC -DBOOST_LOG_DYN_LINK" C_Options="-std=c++11;-std=c99;-Wall;-g -Wall -fexceptions -fPIC -DBOOST_LOG_DYN_LINK" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
+      <Compiler Options="-std=c++11;-Wall;-g -Wall -fexceptions -fPIC -DBOOST_LOG_DYN_LINK" C_Options="-std=c99;-Wall;-g -Wall -fexceptions -fPIC -DBOOST_LOG_DYN_LINK" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
         <IncludePath Value="../../../include"/>
       </Compiler>
       <Linker Options="-O0" Required="yes">
@@ -82,7 +82,7 @@
       </Completion>
     </Configuration>
     <Configuration Name="Release" CompilerType="GCC" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
-      <Compiler Options="-std=c++11 -O2 -Wall -fexceptions -fPIC -DBOOST_LOG_DYN_LINK " C_Options="-std=c++11 -O2 -Wall -fexceptions -fPIC -DBOOST_LOG_DYN_LINK " Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
+      <Compiler Options="-std=c++11 -O2 -Wall -fexceptions -fPIC -DBOOST_LOG_DYN_LINK " C_Options="-std=c99 -O2 -Wall -fexceptions -fPIC -DBOOST_LOG_DYN_LINK " Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
         <IncludePath Value="../../../include"/>
       </Compiler>
       <Linker Options="-s " Required="yes">
diff --git a/server/udm-server.project b/server/udm-server.project
index 8442795..0542c19 100644
--- a/server/udm-server.project
+++ b/server/udm-server.project
@@ -85,7 +85,7 @@
       <ResourceCompiler Options=""/>
     </GlobalSettings>
     <Configuration Name="Debug" CompilerType="GCC" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
-      <Compiler Options="-std=c++11;-Wall;-g -Wall -DBOOST_LOG_DYN_LINK" C_Options="-std=c++11;-std=c99;-Wall;-g -Wall -DBOOST_LOG_DYN_LINK" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
+      <Compiler Options="-std=c++11;-Wall;-g -Wall -DBOOST_LOG_DYN_LINK" C_Options="-std=c99;-Wall;-g -Wall -DBOOST_LOG_DYN_LINK" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
         <IncludePath Value="include"/>
         <IncludePath Value="include"/>
         <IncludePath Value="../protocol"/>