Fix the operlog module double logging when tosnomask is enabled.

[user/henk/code/inspircd.git] / src / modulemanager.cpp

diff --git a/src/modulemanager.cpp b/src/modulemanager.cpp
index 218b9aa5a8a07c86ee13c38a9b5f3c88a361a4fd..e5309af57dc10921f4bab7820c043ea3ef824975 100644 (file)
--- a/src/modulemanager.cpp
+++ b/src/modulemanager.cpp
@@ -69,13 +69,13 @@ bool ModuleManager::Load(const std::string& modname, bool defer)
                        newmod->ModuleSourceFile = filename;
                        newmod->ModuleDLLManager = newhandle;
                        Modules[filename] = newmod;
-                       std::string version = newhandle->GetVersion();
-                       if (version.empty())
-                               version.assign("unknown");
+                       const char* version = newhandle->GetVersion();
+                       if (!version)
+                               version = "unknown";
                        if (defer)
                        {
                                ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "New module introduced: %s (Module version %s)",
-                                       filename.c_str(), version.c_str());
+                                       filename.c_str(), version);
                        }
                        else
                        {
@@ -88,7 +88,7 @@ bool ModuleManager::Load(const std::string& modname, bool defer)
 
                                Version v = newmod->GetVersion();
                                ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "New module introduced: %s (Module version %s)%s",
-                                       filename.c_str(), version.c_str(), (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]"));
+                                       filename.c_str(), version, (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]"));
                        }
                }
                else