summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZdenek Prikryl <zdeny@dhcp-lab-218.englab.brq.redhat.com>2009-08-14 19:46:15 +0200
committerZdenek Prikryl <zdeny@dhcp-lab-218.englab.brq.redhat.com>2009-08-14 19:46:15 +0200
commitb177da424a5ba6e1b8ec0e75c3d15ea7cbf7cdae (patch)
tree8f557a59111bd2ac422153bdce41613921922cf1
parent97c2b59763339ad7d8a9a8fbbca0a2aa24c709f9 (diff)
downloadabrt-b177da424a5ba6e1b8ec0e75c3d15ea7cbf7cdae.tar.gz
abrt-b177da424a5ba6e1b8ec0e75c3d15ea7cbf7cdae.tar.xz
abrt-b177da424a5ba6e1b8ec0e75c3d15ea7cbf7cdae.zip
fixed getting plugin's settings
-rw-r--r--src/Daemon/PluginManager.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/Daemon/PluginManager.cpp b/src/Daemon/PluginManager.cpp
index 1f450d50..9bc8e6f9 100644
--- a/src/Daemon/PluginManager.cpp
+++ b/src/Daemon/PluginManager.cpp
@@ -333,18 +333,17 @@ map_plugin_settings_t CPluginManager::GetPluginSettings(const std::string& pName
{
if (m_mapPlugins.find(pName) != m_mapPlugins.end())
{
+ ret = m_mapPlugins[pName]->GetSettings();
+
if (m_mapABRTPlugins[pName]->GetType() == REPORTER)
{
std::string home = get_home_dir(atoi(pUID.c_str()));
if (home != "")
{
- if (LoadPluginSettings(home + "/.abrt/" + pName + "." + PLUGINS_CONF_EXTENSION, ret))
- {
- return ret;
- }
+ LoadPluginSettings(home + "/.abrt/" + pName + "." + PLUGINS_CONF_EXTENSION, ret);
}
}
- return m_mapPlugins[pName]->GetSettings();
+ return ret;
}
}
return ret;