From c202dea024542b9c6c6b771bb9a3a081d9eacdc5 Mon Sep 17 00:00:00 2001
From: attilamolnar <attilamolnar@hush.com>
Date: Fri, 16 Aug 2013 12:10:55 +0200
Subject: Replace OnRehash() with ReadConfig() that is called on boot, on
 module load and on rehash

This eliminates the need for calling OnRehash() in init()
---
 src/modmanager_static.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/modmanager_static.cpp')

diff --git a/src/modmanager_static.cpp b/src/modmanager_static.cpp
index 321bf520d..eeb8b6f96 100644
--- a/src/modmanager_static.cpp
+++ b/src/modmanager_static.cpp
@@ -102,8 +102,11 @@ bool ModuleManager::Load(const std::string& name, bool defer)
 		}
 		else
 		{
+			ConfigStatus confstatus;
+
 			AttachAll(mod);
 			mod->init();
+			mod->ReadConfig(confstatus);
 		}
 	}
 	catch (CoreException& modexcept)
@@ -203,6 +206,8 @@ void ModuleManager::LoadAll()
 		}
 	}
 
+	ConfigStatus confstatus;
+
 	for(std::map<std::string, Module*>::iterator i = Modules.begin(); i != Modules.end(); i++)
 	{
 		Module* mod = i->second;
@@ -210,6 +215,7 @@ void ModuleManager::LoadAll()
 		{
 			AttachAll(mod);
 			mod->init();
+			mod->ReadConfig(confstatus);
 		}
 		catch (CoreException& modexcept)
 		{
-- 
cgit v1.2.3