git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug_411_timeshift_disable_without_live' into experimental
[enigma2.git]
/
lib
/
base
/
ebase.cpp
diff --git
a/lib/base/ebase.cpp
b/lib/base/ebase.cpp
index f42b72b8b7ef4da7055ec1e7b8f20a3536c2d13a..5bafe7323e86781527239265408f27de56323d16 100644
(file)
--- a/
lib/base/ebase.cpp
+++ b/
lib/base/ebase.cpp
@@
-126,7
+126,6
@@
eMainloop::~eMainloop()
void eMainloop::addSocketNotifier(eSocketNotifier *sn)
{
int fd = sn->getFD();
void eMainloop::addSocketNotifier(eSocketNotifier *sn)
{
int fd = sn->getFD();
- std::map<int, eSocketNotifier*>::iterator it(notifiers.find(fd));
if (m_inActivate && m_inActivate->ref.count == 1)
{
/* when the current active SocketNotifier's refcount is one,
if (m_inActivate && m_inActivate->ref.count == 1)
{
/* when the current active SocketNotifier's refcount is one,
@@
-226,6
+225,7
@@
int eMainloop::processOneEvent(unsigned int twisted_timeout, PyObject **res, ePy
}
m_is_idle = 1;
}
m_is_idle = 1;
+ ++m_idle_count;
if (this == eApp)
{
if (this == eApp)
{