stop update length timer when a movie was selected

[enigma2.git] / lib / dvb / dvb.cpp

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index ba76a40d3555f7af697822178ab34f1e437bf5ba..9d5a68aa225b974210d16136bd234b389697cd4a 100644 (file)
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -432,9 +432,16 @@ RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel)
 {
        ePtr<eDVBAllocatedDemux> demux;
 
+       if (m_cached_channel && m_releaseCachedChannelTimer.isActive())
+       {
+               m_cached_channel_state_changed_conn.disconnect();
+               m_cached_channel=0;
+               m_releaseCachedChannelTimer.stop();
+       }
+
        eDVBChannel *ch;
        ch = new eDVBChannel(this, 0);
-       
+
        channel = ch;
        return 0;
 }
@@ -1038,10 +1045,7 @@ RESULT eDVBChannel::playFile(const char *file)
                eDebug("can't open /dev/misc/pvr - you need to buy the new(!) $$$ box! (%m)"); // or wait for the driver to be improved.
                return -ENODEV;
        }
-       
-       m_state = state_ok;
-       m_stateChanged(this);
-       
+
        m_pvr_thread = new eFilePushThread();
        m_pvr_thread->enablePVRCommit(1);
        m_pvr_thread->setScatterGather(this);
@@ -1055,6 +1059,9 @@ RESULT eDVBChannel::playFile(const char *file)
        }
        CONNECT(m_pvr_thread->m_event, eDVBChannel::pvrEvent);
 
+       m_state = state_ok;
+       m_stateChanged(this);
+
        return 0;
 }