Fix crash on exit from MIDI connections (#4340)

LMMS · May 8, 2018 · 03aa5fb · 03aa5fb
1 parent af61a82
commit 03aa5fb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/include/MidiPort.h b/include/MidiPort.h
@@ -124,6 +124,8 @@ class MidiPort : public Model, public SerializingObject
 		return m_writablePorts;
 	}
 
+	void invalidateCilent();
+
 	MidiPortMenu* m_readablePortsMenu;
 	MidiPortMenu* m_writablePortsMenu;
 

diff --git a/src/core/midi/MidiClient.cpp b/src/core/midi/MidiClient.cpp
@@ -38,6 +38,10 @@ MidiClient::MidiClient()
 MidiClient::~MidiClient()
 {
 	//TODO: noteOffAll(); / clear all ports
+	for (MidiPort* port : m_midiPorts)
+	{
+		port->invalidateCilent();
+	}
 }
 
 

diff --git a/src/core/midi/MidiPort.cpp b/src/core/midi/MidiPort.cpp
@@ -27,9 +27,12 @@
 
 #include "MidiPort.h"
 #include "MidiClient.h"
+#include "MidiDummy.h"
 #include "Note.h"
 #include "Song.h"
 
+static MidiDummy s_dummyClient;
+
 
 
 MidiPort::MidiPort( const QString& name,
@@ -410,4 +413,7 @@ void MidiPort::updateOutputProgram()
 
 
 
-
+void MidiPort::invalidateCilent()
+{
+	m_midiClient = &s_dummyClient;
+}