diff options
| author |  Sadie Powell | 2020-02-04 12:26:25 +0000 |
|---|---|---|
| committer | Sadie Powell | 2020-02-04 12:26:25 +0000 |
| commit | 6da4987073aad99061360bc54022e342e3a0f555 (patch) | |
| tree | d4e8cca5270013eed9915fe740f346cd6890a7c4 /src/modulemanager.cpp | |
| parent | Various CI improvements. (diff) | |
| parent | Include the ABI version with the incompatible module error message. (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/modulemanager.cpp')
| -rw-r--r-- | src/modulemanager.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/modulemanager.cpp b/src/modulemanager.cpp index a62dd77a6..5ec96cbbb 100644 --- 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 |