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
LMMS · Mar 10, 2019 · 17e87c1 · 17e87c1
1 parent cdd1ddb
commit 17e87c1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/core/Mixer.cpp b/src/core/Mixer.cpp
@@ -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++ )
 	{

diff --git a/src/core/midi/MidiJack.cpp b/src/core/midi/MidiJack.cpp
@@ -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 )