Fix wine forward initialization order

`io_context.run()` returns if there is no more work to do, so it should
be called only after we give it something to do.
This commit is contained in:
Robbert van der Helm
2020-03-08 17:59:47 +01:00
parent ff89d12c1a
commit 1434f5855b
2 changed files with 7 additions and 6 deletions
+1 -1
View File
@@ -124,11 +124,11 @@ HostBridge::HostBridge(audioMasterCallback host_callback)
std::pair<Logger&, bool>(logger, false));
}
});
wine_io_handler = std::thread([&]() { io_context.run(); });
// Print the Wine host's STDOUT and STDERR streams to the log file
async_log_pipe_lines(wine_stdout, wine_stdout_buffer, "[Wine STDOUT] ");
async_log_pipe_lines(wine_stderr, wine_stderr_buffer, "[Wine STDERR] ");
wine_io_handler = std::thread([&]() { io_context.run(); });
// Read the plugin's information from the Wine process. This can only be
// done after we started accepting host callbacks as the plugin might do
+6 -5
View File
@@ -131,11 +131,6 @@ class HostBridge {
* The thread that handles host callbacks.
*/
std::thread host_callback_handler;
/**
* Runs the Boost.Asio `io_context` thread for logging the Wine process
* STDOUT and STDERR messages.
*/
std::thread wine_io_handler;
/**
* The callback function passed by the host to the VST plugin instance.
@@ -153,6 +148,12 @@ class HostBridge {
* The STDERR stream of the Wine process we can forward to the logger.
*/
boost::process::async_pipe wine_stderr;
/**
* Runs the Boost.Asio `io_context` thread for logging the Wine process
* STDOUT and STDERR messages.
*/
std::thread wine_io_handler;
/**
* The Wine process hosting the Windows VST plugin.
*/