git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace software update plugin with a more user friendly approach
[enigma2.git]
/
lib
/
dvb
/
frontend.cpp
diff --git
a/lib/dvb/frontend.cpp
b/lib/dvb/frontend.cpp
index d8be84940e60b0a2a37c366dca4ae73642e140de..d8301db8d5cbf1ae0acd1c7ffcef84eac3d918cb 100644
(file)
--- a/
lib/dvb/frontend.cpp
+++ b/
lib/dvb/frontend.cpp
@@
-1069,10
+1069,8
@@
PyObject *eDVBFrontend::readTransponderData(bool original)
}
}
else
}
}
else
- {
- Py_INCREF(Py_None);
- ret = Py_None;
- }
+ Py_RETURN_NONE;
+
return ret;
}
return ret;
}
@@
-2015,7
+2013,8
@@
int eDVBFrontend::isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm)
{
ASSERT(m_sec);
eDVBFrontendParametersSatellite sat_parm;
{
ASSERT(m_sec);
eDVBFrontendParametersSatellite sat_parm;
- ASSERT(!feparm->getDVBS(sat_parm));
+ int ret = feparm->getDVBS(sat_parm);
+ ASSERT(!ret);
return m_sec->canTune(sat_parm, this, 1 << m_fe);
}
else if (m_type == eDVBFrontend::feCable)
return m_sec->canTune(sat_parm, this, 1 << m_fe);
}
else if (m_type == eDVBFrontend::feCable)