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_258_sorting_of_configsatlist'
[enigma2.git]
/
lib
/
base
/
ebase.h
diff --git
a/lib/base/ebase.h
b/lib/base/ebase.h
index 84845a952d588c03f679cd44658d32cbde14764f..524052bda4f9b723ec4208b342d98b29ae0f6605 100644
(file)
--- a/
lib/base/ebase.h
+++ b/
lib/base/ebase.h
@@
-195,6
+195,7
@@
class eMainloop
int processOneEvent(unsigned int user_timeout, PyObject **res=0, ePyObject additional=ePyObject());
int retval;
int m_is_idle;
int processOneEvent(unsigned int user_timeout, PyObject **res=0, ePyObject additional=ePyObject());
int retval;
int m_is_idle;
+ eSocketNotifier *m_inActivate;
int m_interrupt_requested;
timespec m_twisted_timer; // twisted timer
int m_interrupt_requested;
timespec m_twisted_timer; // twisted timer
@@
-209,7
+210,7
@@
public:
#endif
eMainloop()
#endif
eMainloop()
- :app_quit_now(0),loop_level(0),retval(0), m_is_idle(0), m_interrupt_requested(0)
+ :app_quit_now(0),loop_level(0),retval(0), m_is_idle(0), m_in
Activate(0), m_in
terrupt_requested(0)
{
existing_loops.push_back(this);
}
{
existing_loops.push_back(this);
}