Fixed crash on OSX when PanicSound

oleg68 · May 5, 2021 · 95263e6 · 95263e6
1 parent 33b26a4
commit 95263e6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/grandorgue/GOrgueSound.cpp b/src/grandorgue/GOrgueSound.cpp
@@ -230,9 +230,11 @@ void GOrgueSound::CloseSound()
 	{
 		if (m_AudioOutputs[i].port)
 		{
-			m_AudioOutputs[i].port->Close();
-			delete m_AudioOutputs[i].port;
-			m_AudioOutputs[i].port = 0;
+		  const GOrgueSoundPort* port = m_AudioOutputs[i].port;
+
+		  m_AudioOutputs[i].port = NULL;
+		  port->Close();
+		  delete port;
 		}
 	}
 

diff --git a/src/grandorgue/GOrgueSoundRtPort.cpp b/src/grandorgue/GOrgueSoundRtPort.cpp
@@ -47,8 +47,12 @@ GOrgueSoundRtPort::~GOrgueSoundRtPort()
 	Close();
 	try
 	{
-		if (m_port)
-			delete m_port;
+		if (m_port) {
+		  const RtAudio* port = m_port;
+
+		  m_port = NULL;
+		  delete port;
+		}
 	}
 	catch (RtAudioError &e)
 	{