0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

campaignd: Fix SIGINT/reload command issues with an unchanged FIFO path

Browse source 
This prevents campaignd from deleting the current FIFO on config reload
if the path in the config hasn't changed, and potentially losing queued
up commands.
This commit is contained in:
Ignacio R. Morelle 2015-04-23 22:40:53 -03:00
parent d313c8dfb3
commit 1b517975e2
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/campaign_server/campaign_server.cpp
View file

@ -164,7 +164,11 @@ int server::load_config()
// Open the control socket if enabled.
if(!cfg_["control_socket"].empty()) {
input_.reset(new input_stream(cfg_["control_socket"]));
const std::string& path = cfg_["control_socket"].str();
if(!input_.get() || input_->path() != path) {
input_.reset(new input_stream(cfg_["control_socket"]));
}
}
// Ensure the campaigns list WML exists even if empty, other functions