From bf30528ec4ed53d4c6aef2da0410a04124bbc492 Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Sat, 30 Nov 2013 22:14:47 +0100 Subject: DeadlockDetect is configurable now. This is needed when debugging Lua plugins. --- src/Root.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/Root.cpp') diff --git a/src/Root.cpp b/src/Root.cpp index 4a6abaf37..f15bfd366 100644 --- a/src/Root.cpp +++ b/src/Root.cpp @@ -165,14 +165,17 @@ void cRoot::Start(void) LOGD("Starting Authenticator..."); m_Authenticator.Start(IniFile); - IniFile.WriteFile("settings.ini"); - LOGD("Starting worlds..."); StartWorlds(); - LOGD("Starting deadlock detector..."); - dd.Start(); + if (IniFile.GetValueSetB("DeadlockDetect", "Enabled", true)) + { + LOGD("Starting deadlock detector..."); + dd.Start(IniFile.GetValueSetI("DeadlockDetect", "IntervalSec", 20)); + } + IniFile.WriteFile("settings.ini"); + LOGD("Finalising startup..."); m_Server->Start(); -- cgit v1.2.3