Ticket 26. The const MODULE_SETTINGS & ms parameter added to the

[stg.git] / projects / stargazer / plugin_mgr.cpp

diff --git a/projects/stargazer/plugin_mgr.cpp b/projects/stargazer/plugin_mgr.cpp
index d3430c8927d3b86f6b4671ca665af4126235301e..b7ead90d9777cb700bc63b3df7231a529c87a11d 100644 (file)
--- a/projects/stargazer/plugin_mgr.cpp
+++ b/projects/stargazer/plugin_mgr.cpp
@@ -121,15 +121,22 @@ PluginManager::~PluginManager()
 
 void PluginManager::reload(const SETTINGS_IMPL& settings)
 {
 
 void PluginManager::reload(const SETTINGS_IMPL& settings)
 {

+    const std::vector<MODULE_SETTINGS> & modSettings(settings.GetModulesSettings());

     for (size_t i = 0; i < m_modules.size(); ++i)
     {
     for (size_t i = 0; i < m_modules.size(); ++i)
     {

-        PLUGIN & plugin = m_modules[i]->GetPlugin();
-        if (m_modules[i]->Reload())
+        for (size_t j = 0; j < modSettings.size(); j++)

         {
         {

-            m_log("Error reloading module '%s': '%s'", plugin.GetVersion().c_str(),
-                                                       plugin.GetStrError().c_str());
-            printfd(__FILE__, "Error reloading module '%s': '%s'\n", plugin.GetVersion().c_str(),
-                                                                     plugin.GetStrError().c_str());
+           if (modSettings[j].moduleName == m_modules[i]->GetName()) 
+           {
+                PLUGIN & plugin = m_modules[i]->GetPlugin();
+                if (m_modules[i]->Reload(modSettings[j]))
+                {
+                    m_log("Error reloading module '%s': '%s'", plugin.GetVersion().c_str(),
+                                                               plugin.GetStrError().c_str());
+                    printfd(__FILE__, "Error reloading module '%s': '%s'\n", plugin.GetVersion().c_str(),
+                                                                             plugin.GetStrError().c_str());
+                }
+           }

         }
     }
 }
         }
     }
 }