Bläddra i källkod

resource: only start the server if requested

Daniele Bartolini 2 år sedan
förälder
incheckning
3fa9cfe404
3 ändrade filer med 5 tillägg och 2 borttagningar
  1. 1 0
      docs/changelog.rst
  2. 2 1
      src/device/console_server.cpp
  3. 2 1
      src/resource/data_compiler.cpp

+ 1 - 0
docs/changelog.rst

@@ -9,6 +9,7 @@ Changelog
 * Data directories can now be deleted at run-time to force a full data compilation.
 * Some dependencies for Lua scripts are now automatically determined by parsing require() calls in the source.
 * Add ability to pack compiled data together into "bundles".
+* Windows: fixed an issue that prevented the data-compiler to be launched in stand-alone mode when the data-compiler server was running.
 
 **Runtime**
 

+ 2 - 1
src/device/console_server.cpp

@@ -187,7 +187,8 @@ void ConsoleServer::close()
 
 	// Unlock input thread if it is stuck inside the select().
 	u32 blank_header = 0;
-	_dummy_client.write(&blank_header, sizeof(blank_header));
+	if (_dummy_client.is_open())
+		_dummy_client.write(&blank_header, sizeof(blank_header));
 }
 
 void ConsoleServer::shutdown()

+ 2 - 1
src/resource/data_compiler.cpp

@@ -1418,7 +1418,8 @@ int main_data_compiler(const DeviceOptions &opts)
 #endif // if CROWN_PLATFORM_WINDOWS
 
 	console_server_globals::init();
-	console_server()->listen(CROWN_DEFAULT_COMPILER_PORT, opts._wait_console);
+	if (opts._server)
+		console_server()->listen(CROWN_DEFAULT_COMPILER_PORT, opts._wait_console);
 
 	namespace cor = config_resource_internal;
 	namespace ftr = font_resource_internal;