From 98e4ddfb21d285c8b675788c155bb204822fbd4a Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Thu, 6 Feb 2020 11:25:42 +0000
Subject: Use C++11 inline initialisation for class members.

---
 src/modules/m_spanningtree/utils.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/modules/m_spanningtree/utils.h')

diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h
index eb9d76652..01c474f8e 100644
--- a/src/modules/m_spanningtree/utils.h
+++ b/src/modules/m_spanningtree/utils.h
@@ -86,7 +86,7 @@ class SpanningTreeUtilities : public classbase
 	unsigned int PingWarnTime;
 	/** This variable represents the root of the server tree
 	 */
-	TreeServer *TreeRoot;
+	TreeServer *TreeRoot = nullptr;
 	/** IPs allowed to link to us
 	 */
 	std::vector<std::string> ValidIPs;
@@ -107,8 +107,12 @@ class SpanningTreeUtilities : public classbase
 	std::vector<reference<Autoconnect> > AutoconnectBlocks;
 
 	/** Ping frequency of server to server links
+	 * XXX: TreeServer constructor reads this and TreeRoot is created before the
+	 * config is read, so init it to something (value doesn't matter) to avoid a
+	 * valgrind warning in TimerManager on unload
 	 */
-	unsigned int PingFreq;
+	unsigned int PingFreq = 60;
+	
 
 	/** Initialise utility class
 	 */
-- 
cgit v1.3.1-10-gc9f91