Fixed getting configure button going to port 0.
This commit is contained in:
parent
155f1751ce
commit
b424877448
@ -123,10 +123,9 @@ extern "C" jboolean Java_com_mcserver_MCServerActivity_NativeIsServerRunning( JN
|
||||
|
||||
extern "C" jint Java_com_mcserver_MCServerActivity_NativeGetWebAdminPort( JNIEnv* env, jobject thiz )
|
||||
{
|
||||
cIniFile IniFile;
|
||||
if (IniFile.ReadFile("/sdcard/mcserver/webadmin.ini"))
|
||||
if( pRoot != NULL && pRoot->GetWebAdmin() != NULL )
|
||||
{
|
||||
return IniFile.GetValueI("WebAdmin", "Port");
|
||||
return atoi(pRoot->GetWebAdmin()->GetIPv4Ports().c_str());
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
@ -100,10 +100,10 @@ bool cWebAdmin::Init(void)
|
||||
|
||||
LOGD("Initialising WebAdmin...");
|
||||
|
||||
AString PortsIPv4 = m_IniFile.GetValueSet("WebAdmin", "Port", "8080");
|
||||
AString PortsIPv6 = m_IniFile.GetValueSet("WebAdmin", "PortsIPv6", "");
|
||||
m_PortsIPv4 = m_IniFile.GetValueSet("WebAdmin", "Port", "8080");
|
||||
m_PortsIPv6 = m_IniFile.GetValueSet("WebAdmin", "PortsIPv6", "");
|
||||
|
||||
if (!m_HTTPServer.Initialize(PortsIPv4, PortsIPv6))
|
||||
if (!m_HTTPServer.Initialize(m_PortsIPv4, m_PortsIPv6))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
@ -132,6 +132,9 @@ public:
|
||||
/// Escapes text passed into it, so it can be embedded into html.
|
||||
static AString GetHTMLEscapedString(const AString & a_Input);
|
||||
|
||||
AString GetIPv4Ports(void) const { return m_PortsIPv4; }
|
||||
AString GetIPv6Ports(void) const { return m_PortsIPv6; }
|
||||
|
||||
// tolua_end
|
||||
|
||||
/// Returns the prefix needed for making a link point to the webadmin root from the given URL ("../../../webadmin"-style)
|
||||
@ -180,6 +183,9 @@ protected:
|
||||
|
||||
PluginList m_Plugins;
|
||||
|
||||
AString m_PortsIPv4;
|
||||
AString m_PortsIPv6;
|
||||
|
||||
/// The Lua template script to provide templates:
|
||||
cLuaState m_TemplateScript;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user