diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2009-04-19 23:33:44 +0200 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2009-04-19 23:33:44 +0200 |
| commit | e8f443313e47e0653d61d23c90352572194e5608 (patch) | |
| tree | 7188d3ea5a8c91066fe1dfd5f7241eeb3e3c5226 /lib/dvb/frontend.cpp | |
| parent | 2d7f4e102ee3231bdb600b0ac7e2d8f898034b78 (diff) | |
| parent | 0d076f400e8740e55289427c0f19c8055c74bbc5 (diff) | |
| download | enigma2-e8f443313e47e0653d61d23c90352572194e5608.tar.gz enigma2-e8f443313e47e0653d61d23c90352572194e5608.zip | |
Merge branch 'master' of /home/tmbinc/enigma2-git
Diffstat (limited to 'lib/dvb/frontend.cpp')
| -rw-r--r-- | lib/dvb/frontend.cpp | 6 |
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(); |