Merge branch 'main' into refactor/mod-information-file-export

Author: Alystrasz

primedev/plugins/pluginmanager.cpp

@@ -1,6 +1,7 @@
 #include "pluginmanager.h"
 
 #include <regex>
+#include <ranges>
 #include "plugins.h"
 #include "config/profile.h"
 #include "core/convar/concommand.h"
@@ -111,13 +112,14 @@ bool PluginManager::LoadPlugins(bool reloaded)
 
 void PluginManager::ReloadPlugins()
 {
-	for (const Plugin& plugin : this->GetLoadedPlugins())
+	NS::log::PLUGINSYS->info("Reloading plugins");
+
+	for (const Plugin& plugin : this->plugins | std::views::reverse)
 	{
-		plugin.Unload();
+		std::string name = plugin.GetName();
+		if (plugin.Reload())
+			NS::log::PLUGINSYS->info("Reloaded {}", name);
 	}
-
-	this->plugins.clear();
-	this->LoadPlugins(true);
 }
 
 void PluginManager::RemovePlugin(HMODULE handle)

primedev/plugins/plugins.cpp

@@ -138,9 +138,9 @@ bool Plugin::Unload() const
 
 	if (IsValid())
 	{
-		bool unloaded = m_callbacks->Unload();
+		bool shouldUnload = m_callbacks->Unload();
 
-		if (!unloaded)
+		if (!shouldUnload)
 			return false;
 	}
 
@@ -154,14 +154,18 @@ bool Plugin::Unload() const
 	return true;
 }
 
-void Plugin::Reload() const
+bool Plugin::Reload() const
 {
+	std::string location = m_location;
+
 	bool unloaded = Unload();
 
 	if (!unloaded)
-		return;
+		return false;
 
-	g_pPluginManager->LoadPlugin(fs::path(m_location), true);
+	g_pPluginManager->LoadPlugin(fs::path(location), true);
+
+	return true;
 }
 
 void Plugin::Log(spdlog::level::level_enum level, char* msg) const

primedev/plugins/plugins.h

@@ -28,7 +28,7 @@ class Plugin
 
 	Plugin(std::string path);
 	bool Unload() const;
-	void Reload() const;
+	bool Reload() const;
 
 	// sys
 	void Log(spdlog::level::level_enum level, char* msg) const;