summaryrefslogtreecommitdiff
path: root/library/PluginManager.cpp
diff options
context:
space:
mode:
authorPetr Mrázek2012-03-01 00:33:11 +0100
committerPetr Mrázek2012-03-01 00:33:11 +0100
commitc6fd508ee332bf7479b2569129c12176440d70b3 (patch)
tree74a5ef460862db1107bd467094a77fc5a48274d7 /library/PluginManager.cpp
parent07b4044336176e8277f3adaa2e03c406e77b6b76 (diff)
downloaddfhack-c6fd508ee332bf7479b2569129c12176440d70b3.tar.gz
dfhack-c6fd508ee332bf7479b2569129c12176440d70b3.tar.bz2
dfhack-c6fd508ee332bf7479b2569129c12176440d70b3.tar.xz
Fix possible source of vile errors.
Diffstat (limited to 'library/PluginManager.cpp')
-rw-r--r--library/PluginManager.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/library/PluginManager.cpp b/library/PluginManager.cpp
index 492c4be6..5d5ef357 100644
--- a/library/PluginManager.cpp
+++ b/library/PluginManager.cpp
@@ -181,17 +181,17 @@ bool Plugin::load()
return false;
}
const char ** plug_name =(const char ** ) LookupPlugin(plug, "name");
- if(!plug_name)
+ const char ** plug_version =(const char ** ) LookupPlugin(plug, "version");
+ if(!plug_name || !plug_version)
{
- con.printerr("Plugin %s has no name.\n", filename.c_str());
+ con.printerr("Plugin %s has no name or version.\n", filename.c_str());
ClosePlugin(plug);
state = PS_BROKEN;
return false;
}
- const char ** plug_version =(const char ** ) LookupPlugin(plug, "version");
- if(!plug_version || strcmp(DFHACK_VERSION, *plug_version) != 0)
+ if(strcmp(DFHACK_VERSION, *plug_version) != 0)
{
- con.printerr("Plugin sx was not built for this version of DFHack.\n"
+ con.printerr("Plugin %s was not built for this version of DFHack.\n"
"Plugin: %s, DFHack: %s\n", *plug_name, *plug_version, DFHACK_VERSION);
ClosePlugin(plug);
state = PS_BROKEN;