diff options
| author | Mattes D <github@xoft.cz> | 2013-10-07 22:19:14 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2013-10-07 22:19:14 +0200 |
| commit | e3ba3b8f97f8dd2a4e6dc7ec17f61a2d576fe346 (patch) | |
| tree | 47b7c978eb2dfdb3771b1edf907482ade9eb1d34 /source/Root.cpp | |
| parent | Fixed startup timings on server restart. (diff) | |
| parent | Fixed memory leaks in the HTTP framework (diff) | |
| download | cuberite-e3ba3b8f97f8dd2a4e6dc7ec17f61a2d576fe346.tar cuberite-e3ba3b8f97f8dd2a4e6dc7ec17f61a2d576fe346.tar.gz cuberite-e3ba3b8f97f8dd2a4e6dc7ec17f61a2d576fe346.tar.bz2 cuberite-e3ba3b8f97f8dd2a4e6dc7ec17f61a2d576fe346.tar.lz cuberite-e3ba3b8f97f8dd2a4e6dc7ec17f61a2d576fe346.tar.xz cuberite-e3ba3b8f97f8dd2a4e6dc7ec17f61a2d576fe346.tar.zst cuberite-e3ba3b8f97f8dd2a4e6dc7ec17f61a2d576fe346.zip | |
Diffstat (limited to 'source/Root.cpp')
| -rw-r--r-- | source/Root.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/source/Root.cpp b/source/Root.cpp index c2a402b7f..26e6d347d 100644 --- a/source/Root.cpp +++ b/source/Root.cpp @@ -134,17 +134,9 @@ void cRoot::Start(void) } IniFile.WriteFile(); - cIniFile WebIniFile("webadmin.ini"); - if (!WebIniFile.ReadFile()) - { - LOGWARNING("webadmin.ini inaccessible, wabadmin is disabled"); - } - - if (WebIniFile.GetValueB("WebAdmin", "Enabled", false)) - { - LOGD("Creating WebAdmin..."); - m_WebAdmin = new cWebAdmin(8080); - } + LOG("Initialising WebAdmin..."); + m_WebAdmin = new cWebAdmin(); + m_WebAdmin->Init(); LOGD("Loading settings..."); m_GroupManager = new cGroupManager(); @@ -173,6 +165,9 @@ void cRoot::Start(void) LOGD("Finalising startup..."); m_Server->Start(); + + LOG("Starting WebAdmin..."); + m_WebAdmin->Start(); #if !defined(ANDROID_NDK) LOGD("Starting InputThread..."); |