From 2ee3b7c2fae3a46fe7bff59f94d11606f7782d56 Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Fri, 3 Mar 2023 13:21:10 +0100 Subject: [PATCH] Fix InitContext drop order for standalone presets --- src/wrapper/standalone/wrapper.rs | 35 ++++++++++++++++++------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/src/wrapper/standalone/wrapper.rs b/src/wrapper/standalone/wrapper.rs index b15214ee..d6480417 100644 --- a/src/wrapper/standalone/wrapper.rs +++ b/src/wrapper/standalone/wrapper.rs @@ -468,22 +468,24 @@ impl> Wrapper { } let sample_rate = self.buffer_config.sample_rate; - let mut plugin = self.plugin.lock(); - if let ProcessStatus::Error(err) = plugin.process( - buffer, - aux, - &mut self.make_process_context(transport, input_events, output_events), - ) { - nih_error!("The plugin returned an error while processing:"); - nih_error!("{}", err); + { + let mut plugin = self.plugin.lock(); + if let ProcessStatus::Error(err) = plugin.process( + buffer, + aux, + &mut self.make_process_context(transport, input_events, output_events), + ) { + nih_error!("The plugin returned an error while processing:"); + nih_error!("{}", err); - let push_successful = gui_task_sender.send(GuiTask::Close).is_ok(); - nih_debug_assert!( - push_successful, - "Could not queue window close, the editor will remain open" - ); + let push_successful = gui_task_sender.send(GuiTask::Close).is_ok(); + nih_debug_assert!( + push_successful, + "Could not queue window close, the editor will remain open" + ); - return false; + return false; + } } // Any output note events are now in a vector that can be processed by the @@ -532,12 +534,15 @@ impl> Wrapper { ); }); + // NOTE: This needs to be dropped after the `plugin` lock to avoid deadlocks + let mut init_context = self.make_init_context(); + let mut plugin = self.plugin.lock(); // See above permit_alloc(|| { plugin.initialize( &self.audio_io_layout, &self.buffer_config, - &mut self.make_init_context(), + &mut init_context, ) }); plugin.reset();