X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6dcb75c26bbfec04b381bb99d75404f9fe50635d..bd7a5be245b3f3bac1a822baec4378f341e0b781:/lib/nav/core.cpp

diff --git a/lib/nav/core.cpp b/lib/nav/core.cpp
index a687eabe..062a7d00 100644
--- a/lib/nav/core.cpp
+++ b/lib/nav/core.cpp
@@ -4,9 +4,9 @@
 
 void eNavigation::serviceEvent(iPlayableService* service, int event)
 {
-	if (service != m_runningService)
+	if (m_runningService && service != m_runningService)
 	{
-		eDebug("nav: event for other service");
+		eDebug("nav: event %d for other service", event);
 		return;
 	}
 	m_event(event);
@@ -59,12 +59,15 @@ RESULT eNavigation::stopService(void)
 		/* check if there is a running service... */
 	if (!m_runningService)
 		return 1;
-			/* send stop event */
+
+	ePtr<iPlayableService> tmp = m_runningService;
+	m_runningService=0;
+	tmp->stop();
+
+	/* send stop event */
 	m_event(iPlayableService::evEnd);
 
-	m_runningService->stop();
 		/* kill service. */
-	m_runningService = 0;
 	m_service_event_conn = 0;
 	return 0;
 }
@@ -93,8 +96,11 @@ RESULT eNavigation::stopRecordService(ePtr<iRecordableService> &service)
 	if (it != m_recordings.end())
 	{
 		m_recordings.erase(it);
+		/* send stop event */
+		m_record_event(service, iRecordableService::evEnd);
 		return 0;
 	}
+
 	eDebug("try to stop non running recording!!");  // this should not happen
 	return -1;
 }
@@ -104,7 +110,7 @@ PyObject *eNavigation::getRecordings(void)
 	ePyObject result = PyList_New(m_recordings.size());
 	int pos=0;
 	for (std::map<ePtr<iRecordableService>, ePtr<eConnection> >::iterator it(m_recordings.begin()); it != m_recordings.end(); ++it)
-		PyList_SET_ITEM(result, pos++, New_iRecordableServicePtr(it->first)); 
+		PyList_SET_ITEM(result, pos++, NEW_iRecordableServicePtr(it->first)); 
 	return result;
 }