From 7df81bcb7c971fbdea62920ca9fec10c1a6a8240 Mon Sep 17 00:00:00 2001 From: Benau Date: Fri, 7 Dec 2018 01:23:42 +0800 Subject: [PATCH] Set m_server_configurable flag in correct place for GUI server --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 211a0e4a5..b23a494a4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1251,6 +1251,7 @@ int handleCmdLine(bool has_server_config, bool has_parent_process) { NetworkConfig::get()->setServerIdFile( file_manager->getUserConfigFile(s)); + ServerConfig::m_server_configurable = true; } if (CommandLine::has("--disable-polling")) { @@ -1954,7 +1955,6 @@ int main(int argc, char *argv[] ) { main_loop = new MainLoop(parent_pid); has_parent_process = true; - ServerConfig::m_server_configurable = true; } else main_loop = new MainLoop(0/*parent_pid*/);