2 files changed, 4 insertions, 0 deletions
diff --git a/HISTORY b/HISTORY
index f6f8c9d..b906a3a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2,6 +2,7 @@ VDR Plugin 'rpihddevice' Revision History
 -----------------------------------------
 
 - fixed:
+  - OMX shutdown when no stream has been played (reported by Klaus Schmidinger)
   - displaying subtitles when OSD is active (fix by Klaus Schmidinger)
   - default quality when grabbing jpeg image (reported by Klaus Schmidinger)
   - suppress buffer stall when clock is halted
diff --git a/omx.c b/omx.c
index af08f0c..2ae7b8b 100644
--- a/omx.c
+++ b/omx.c
@@ -349,6 +349,9 @@ int cOmx::DeInit(void)
 {
 	Cancel();
 
+	for (int i = 0; i < eNumTunnels; i++)
+		ilclient_disable_tunnel(&m_tun[i]);
+
 	ilclient_teardown_tunnels(m_tun);
 	ilclient_state_transition(m_comp, OMX_StateIdle);
 	ilclient_state_transition(m_comp, OMX_StateLoaded);