summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Færøy <ahf@0x90.dk>2014-06-15 21:57:42 +0200
committerAlexander Færøy <ahf@0x90.dk>2014-06-15 21:57:42 +0200
commit53f50d3dfa79899f3362411d989c4dfdc1a9b952 (patch)
tree1a5411560b6948c31ddad399499c29baff5525b5
parent63011c2bf8f6d5c32a7793105db1702ee4c36e66 (diff)
parent5b2d189ab5e5d618a99598e23ef91acceddbd239 (diff)
downloadirssi-53f50d3dfa79899f3362411d989c4dfdc1a9b952.zip
Merge pull request #33 from dajohi/modules_load
Silence a compiler warning.
-rw-r--r--src/core/modules-load.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/modules-load.c b/src/core/modules-load.c
index 9b9bc952..8e65ecd4 100644
--- a/src/core/modules-load.c
+++ b/src/core/modules-load.c
@@ -184,9 +184,6 @@ static int module_load_name(const char *path, const char *rootmodule,
g_free(initfunc);
g_free(deinitfunc);
- module_init = value1;
- module_deinit = value2;
-
if (!found) {
module_error(MODULE_ERROR_INVALID, NULL,
rootmodule, submodule);
@@ -194,6 +191,9 @@ static int module_load_name(const char *path, const char *rootmodule,
return 0;
}
+ module_init = value1;
+ module_deinit = value2;
+
/* Call the module's init() function - it should register itself
with module_register() function, abort if it doesn't. */
module_init();