X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/10e7e45ae92d4fe06f70126ed256b87896dbc432..45aefe230c922417067e3409039e4372340e894f:/lib/base/ebase.cpp

diff --git a/lib/base/ebase.cpp b/lib/base/ebase.cpp
index a66d1958..313732ab 100644
--- a/lib/base/ebase.cpp
+++ b/lib/base/ebase.cpp
@@ -39,7 +39,8 @@ void eSocketNotifier::stop()
 	}
 }
 
-					// timer
+DEFINE_REF(eTimer);
+
 void eTimer::start(long msek, bool singleShot)
 {
 	if (bActive)
@@ -125,6 +126,17 @@ eMainloop::~eMainloop()
 void eMainloop::addSocketNotifier(eSocketNotifier *sn)
 {
 	int fd = sn->getFD();
+	if (m_inActivate && m_inActivate->ref.count == 1)
+	{
+		/*  when the current active SocketNotifier's refcount is one,
+			then no more external references are existing.
+			So it gets destroyed when the activate callback is finished (->AddRef() / ->Release() calls in processOneEvent).
+			But then the sn->stop() is called to late for the next Asserion.
+			Thus we call sn->stop() here (this implicitly calls eMainloop::removeSocketNotifier) and we don't get trouble
+			with the next Assertion.
+		*/
+		m_inActivate->stop();
+	}
 	ASSERT(notifiers.find(fd) == notifiers.end());
 	notifiers[fd]=sn;
 }
@@ -160,7 +172,12 @@ int eMainloop::processOneEvent(unsigned int twisted_timeout, PyObject **res, ePy
 	{
 		/* process all timers which are ready. first remove them out of the list. */
 		while (!m_timer_list.empty() && (poll_timeout = timeout_usec( m_timer_list.begin()->getNextActivation() ) ) <= 0 )
-			m_timer_list.begin()->activate();
+		{
+			eTimer *tmr = m_timer_list.begin();
+			tmr->AddRef();
+			tmr->activate();
+			tmr->Release();
+		}
 		if (poll_timeout < 0)
 			poll_timeout = 0;
 		else /* convert us to ms */
@@ -237,14 +254,15 @@ int eMainloop::processOneEvent(unsigned int twisted_timeout, PyObject **res, ePy
 				if (it != notifiers.end()
 					&& it->second->state == 1) // added and in poll
 				{
-					eSocketNotifier *sn = it->second;
-					int req = sn->getRequested();
+					m_inActivate = it->second;
+					int req = m_inActivate->getRequested();
 					if (pfd[i].revents & req) {
-						sn->AddRef();
-						sn->activate(pfd[i].revents & req);
-						sn->Release();
+						m_inActivate->AddRef();
+						m_inActivate->activate(pfd[i].revents & req);
+						m_inActivate->Release();
 					}
 					pfd[i].revents &= ~req;
+					m_inActivate = 0;
 				}
 				if (pfd[i].revents & (POLLERR|POLLHUP|POLLNVAL))
 					eDebug("poll: unhandled POLLERR/HUP/NVAL for fd %d(%d)", pfd[i].fd, pfd[i].revents);
@@ -403,7 +421,7 @@ eTimerPy_dealloc(eTimerPy* self)
 	if (self->in_weakreflist != NULL)
 		PyObject_ClearWeakRefs((PyObject *) self);
 	eTimerPy_clear(self);
-	delete self->tm;
+	self->tm->Release();
 	self->ob_type->tp_free((PyObject*)self);
 }
 
@@ -411,7 +429,8 @@ static PyObject *
 eTimerPy_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
 	eTimerPy *self = (eTimerPy *)type->tp_alloc(type, 0);
-	self->tm = new eTimer(eApp);
+	self->tm = eTimer::create(eApp);
+	self->tm->AddRef();
 	self->in_weakreflist = NULL;
 	return (PyObject *)self;
 }