diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-01-20 22:33:44 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-01-20 22:33:44 +0000 |
| commit | b80cca410573b20277bd0f1fdb673c37c2ec1b09 (patch) | |
| tree | aa8b65f52adaecc5c0535cab2cb8a20debb56d52 /lib/dvb/frontend.cpp | |
| parent | 462ec6f4ad2051551cb91c75ba614d3b7b17c543 (diff) | |
| download | enigma2-b80cca410573b20277bd0f1fdb673c37c2ec1b09.tar.gz enigma2-b80cca410573b20277bd0f1fdb673c37c2ec1b09.zip | |
fix
Diffstat (limited to 'lib/dvb/frontend.cpp')
| -rw-r--r-- | lib/dvb/frontend.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp index 9d4061e6..99cafe75 100644 --- a/lib/dvb/frontend.cpp +++ b/lib/dvb/frontend.cpp @@ -413,19 +413,12 @@ void eDVBFrontend::feEvent(int w) void eDVBFrontend::timeout() { - int state; + m_tuning = 0; if (m_state == stateTuning) { - state = stateFailed; - eDebug("DVBFrontend: timeout"); - if (m_state != state) - { - m_state = state; - m_stateChanged(this); - } - m_tuning = 0; - } else - m_tuning = 0; + m_state = stateFailed; + m_stateChanged(this); + } } int eDVBFrontend::readFrontendData(int type) @@ -941,6 +934,7 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where) m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) ); m_tuneTimer->start(0,true); + m_timeout->stop(); m_sec_sequence.current() = m_sec_sequence.begin(); if (m_state != stateTuning) |