--- linuxsampler/trunk/src/Sampler.cpp	2005/03/02 16:25:27	419
+++ linuxsampler/trunk/src/Sampler.cpp	2005/03/03 03:25:17	420
@@ -49,8 +49,10 @@
         if (pEngineChannel) {
             MidiInputPort* pMidiInputPort = GetMidiInputDevicePort(this->midiPort);
             if (pMidiInputPort) pMidiInputPort->Disconnect(pEngineChannel);
-            if (pAudioOutputDevice) pEngineChannel->DisconnectAudioOutputDevice();
-            delete pEngineChannel;
+            if (pEngineChannel) {
+                if (pAudioOutputDevice) pEngineChannel->DisconnectAudioOutputDevice();
+                delete pEngineChannel;
+            }
         }
     }