Add one more command server fix so it still works correctly on Windows and reeanble the command server by default.

actorid
athile 15 years ago
parent 57de436db4
commit a638c330ec

@ -32,7 +32,7 @@ bool parseOptions (int argc, char**argv, OMW::Engine& engine)
( "debug", "debug mode" ) ( "debug", "debug mode" )
( "script-verbose", "verbose script output" ) ( "script-verbose", "verbose script output" )
( "new-game", "activate char gen/new game mechanics" ) ( "new-game", "activate char gen/new game mechanics" )
( "enable-command-server", "turn on the command server" ) ( "disable-command-server", "turn off the command server" )
; ;
bpo::variables_map variables; bpo::variables_map variables;
@ -64,7 +64,7 @@ bool parseOptions (int argc, char**argv, OMW::Engine& engine)
if (variables.count ("new-game")) if (variables.count ("new-game"))
engine.setNewGame(); engine.setNewGame();
if (variables.count("enable-command-server")) if (variables.count("disable-command-server") == 0)
engine.enableCommandServer(); engine.enableCommandServer();
return true; return true;

@ -54,6 +54,7 @@ namespace OMW { namespace CommandServer { namespace Detail {
void Connection::stop() void Connection::stop()
{ {
mSocket.shutdown(boost::asio::socket_base::shutdown_both); mSocket.shutdown(boost::asio::socket_base::shutdown_both);
mSocket.close();
mpThread->join(); mpThread->join();
} }

Loading…
Cancel
Save