aboutsummaryrefslogtreecommitdiff
path: root/lib/dvb
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2009-04-08 22:22:45 +0200
committerghost <andreas.monzner@multimedia-labs.de>2009-04-08 22:22:45 +0200
commitd260444ce272d455ce8b71fd1870d4246b542bfa (patch)
tree569bdf01213164262e1a696178b6d3778739072d /lib/dvb
parent0c1fae422b8ae58a9ec990145ee8050d14c61500 (diff)
downloadenigma2-d260444ce272d455ce8b71fd1870d4246b542bfa.tar.gz
enigma2-d260444ce272d455ce8b71fd1870d4246b542bfa.zip
frontend.cpp: use m_state != stateClosed instead of use m_sn to check if the frontend is already opened... this works with simulate frontends too ;)
this fixes the timer collision check in some conditions
Diffstat (limited to 'lib/dvb')
-rw-r--r--lib/dvb/frontend.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index f2fc12b3..a2ccf3b0 100644
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -448,7 +448,7 @@ int eDVBFrontend::PriorityOrder=0;
eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok, bool simulate)
:m_simulate(simulate), m_enabled(false), m_type(-1), m_dvbid(fe), m_slotid(fe)
,m_fd(-1), m_need_rotor_workaround(false), m_can_handle_dvbs2(false)
- , m_timeout(0), m_tuneTimer(0)
+ ,m_state(stateClosed), m_timeout(0), m_tuneTimer(0)
#if HAVE_DVB_API_VERSION < 3
,m_secfd(-1)
#endif
@@ -477,7 +477,7 @@ eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok, bool simulate)
int eDVBFrontend::openFrontend()
{
- if (m_sn)
+ if (m_state != stateClosed)
return -1; // already opened
m_state=stateIdle;
@@ -1349,7 +1349,7 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer
state = sec_fe->m_state;
}
// sec_fe is closed... we must reopen it here..
- if (state == eDVBFrontend::stateClosed)
+ if (state == stateClosed)
{
regFE = prev;
prev->inc_use();