Fix MidiJack crash on exit

* Fix uninitialized m_jackClient being used in MidiJack destructor
* Fix destruction order in Mixer.cpp so that MidiJack doesn't access the
  deleted AudioJack instance

Fixes #4688
This commit is contained in:
Lukas W
2019-03-10 10:27:51 +01:00
parent cdd1ddbb0c
commit 17e87c1d68
2 changed files with 2 additions and 1 deletions

View File

@@ -186,8 +186,8 @@ Mixer::~Mixer()
}
delete m_fifo;
delete m_audioDev;
delete m_midiClient;
delete m_audioDev;
for( int i = 0; i < 3; i++ )
{

View File

@@ -61,6 +61,7 @@ static void JackMidiShutdown(void *arg)
MidiJack::MidiJack() :
MidiClientRaw(),
m_jackClient( nullptr ),
m_input_port( NULL ),
m_output_port( NULL ),
m_quit( false )