X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_reloadmodule.cpp;h=98bf2ab405b17f55665c2c0fc11230b65c530ae8;hb=c71361e8e4f22cb4f72881399bce2832eb080b0e;hp=383d574bfe3c077798d22c24116532cf36378e91;hpb=58a0a7e01422e62de1565a8eb0a1febdc463d04d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_reloadmodule.cpp b/src/coremods/core_reloadmodule.cpp
index 383d574bf..98bf2ab40 100644
--- a/src/coremods/core_reloadmodule.cpp
+++ b/src/coremods/core_reloadmodule.cpp
@@ -1,9 +1,12 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2015 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2017-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2014-2016, 2018 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007, 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -379,7 +382,7 @@ void DataKeeper::SaveExtensions(Extensible* extensible, std::vector<InstanceData
 		if (it == setexts.end())
 			continue;
 
-		std::string value = item->serialize(FORMAT_INTERNAL, extensible, it->second);
+		std::string value = item->ToInternal(extensible, it->second);
 		// If the serialized value is empty the extension won't be saved and restored
 		if (!value.empty())
 			extdata.push_back(InstanceData(index, value));
@@ -597,7 +600,7 @@ void DataKeeper::RestoreExtensions(const std::vector<InstanceData>& list, Extens
 	for (std::vector<InstanceData>::const_iterator i = list.begin(); i != list.end(); ++i)
 	{
 		const InstanceData& id = *i;
-		handledexts[id.index].extitem->unserialize(FORMAT_INTERNAL, extensible, id.serialized);
+		handledexts[id.index].extitem->FromInternal(extensible, id.serialized);
 	}
 }
 
@@ -717,11 +720,9 @@ class ReloadAction : public ActionBase
 		ReloadModule::DataKeeper datakeeper;
 		datakeeper.Save(mod);
 
-		DLLManager* dll = mod->ModuleDLLManager;
 		std::string name = mod->ModuleSourceFile;
 		ServerInstance->Modules->DoSafeUnload(mod);
 		ServerInstance->GlobalCulls.Apply();
-		delete dll;
 		bool result = ServerInstance->Modules->Load(name);
 
 		if (result)
@@ -765,4 +766,21 @@ CmdResult CommandReloadmodule::Handle(User* user, const Params& parameters)
 	}
 }
 
-COMMAND_INIT(CommandReloadmodule)
+class CoreModReloadmodule : public Module
+{
+ private:
+	CommandReloadmodule cmd;
+
+ public:
+	CoreModReloadmodule()
+		: cmd(this)
+	{
+	}
+
+	Version GetVersion() CXX11_OVERRIDE
+	{
+		return Version("Provides the RELOADMODULE command", VF_CORE | VF_VENDOR);
+	}
+};
+
+MODULE_INIT(CoreModReloadmodule)