From c8a892005d53d22fdae3b565ebc033afa680568e Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Tue, 27 Feb 2024 17:07:58 +0000
Subject: Merge the topiclock module into the services module.

---
 src/modules/m_spanningtree/capab.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/modules/m_spanningtree')

diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp
index 06d89e53b..84311e192 100644
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -64,7 +64,11 @@ namespace
 				else if (insp::equalsci(modname, "m_account.so") && ServerInstance->Modules.Find("services"))
 					modname = "m_services_account.so";
 				else if (insp::equalsci(modname, "m_services.so"))
-					modname = "m_svshold.so";
+				{
+					modules["m_svshold.so"];
+					modules["m_topiclock.so"];
+					continue;
+				}
 
 				// Handle modules with changed properties.
 				else if (insp::equalsci(modname, "m_globops.so"))
-- 
cgit v1.3.1-10-gc9f91