Set m_server_configurable flag in correct place for GUI server

This commit is contained in:
Benau 2018-12-07 01:23:42 +08:00
parent 083e1180fb
commit 7df81bcb7c

View File

@ -1251,6 +1251,7 @@ int handleCmdLine(bool has_server_config, bool has_parent_process)
{ {
NetworkConfig::get()->setServerIdFile( NetworkConfig::get()->setServerIdFile(
file_manager->getUserConfigFile(s)); file_manager->getUserConfigFile(s));
ServerConfig::m_server_configurable = true;
} }
if (CommandLine::has("--disable-polling")) if (CommandLine::has("--disable-polling"))
{ {
@ -1954,7 +1955,6 @@ int main(int argc, char *argv[] )
{ {
main_loop = new MainLoop(parent_pid); main_loop = new MainLoop(parent_pid);
has_parent_process = true; has_parent_process = true;
ServerConfig::m_server_configurable = true;
} }
else else
main_loop = new MainLoop(0/*parent_pid*/); main_loop = new MainLoop(0/*parent_pid*/);