small fix

[enigma2.git] / lib / nav / core.cpp

diff --git a/lib/nav/core.cpp b/lib/nav/core.cpp
index 45b4aa6fe99d251ab65927b2a2626b78bfd5dc7e..062a7d00046a48d7736eb0fd9dae146bf55fcc73 100644 (file)
--- 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,13 +59,14 @@ RESULT eNavigation::stopService(void)
                /* check if there is a running service... */
        if (!m_runningService)
                return 1;
-                       /* send stop event */
-       m_event(iPlayableService::evEnd);
 
        ePtr<iPlayableService> tmp = m_runningService;
        m_runningService=0;
        tmp->stop();
 
+       /* send stop event */
+       m_event(iPlayableService::evEnd);
+
                /* kill service. */
        m_service_event_conn = 0;
        return 0;
@@ -95,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;
 }