From aed712ba8e087232fcd9f71db4311687a7ce4398 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Sun, 2 Feb 2020 17:07:34 +0000
Subject: Make loading modules considerably more robust and user friendly.

---
 src/modulemanager.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/modulemanager.cpp')

diff --git a/src/modulemanager.cpp b/src/modulemanager.cpp
index 218b9aa5a..e5309af57 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
-- 
cgit v1.3.1-10-gc9f91