fix segfault on zap with active timeshift

[vuplus_dvbapp] / lib / nav / core.cpp

diff --git a/lib/nav/core.cpp b/lib/nav/core.cpp
index 7f76fa3..45b4aa6 100644 (file)
--- a/lib/nav/core.cpp
+++ b/lib/nav/core.cpp
@@ -1,6 +1,6 @@
 #include <lib/nav/core.h>
 #include <lib/base/eerror.h>
-#include <Python.h>
+#include <lib/python/python.h>
 
 void eNavigation::serviceEvent(iPlayableService* service, int event)
 {
@@ -62,9 +62,11 @@ RESULT eNavigation::stopService(void)
                        /* send stop event */
        m_event(iPlayableService::evEnd);
 
-       m_runningService->stop();
+       ePtr<iPlayableService> tmp = m_runningService;
+       m_runningService=0;
+       tmp->stop();
+
                /* kill service. */
-       m_runningService = 0;
        m_service_event_conn = 0;
        return 0;
 }
@@ -99,14 +101,12 @@ RESULT eNavigation::stopRecordService(ePtr<iRecordableService> &service)
        return -1;
 }
 
-extern PyObject *New_iRecordableServicePtr(const ePtr<iRecordableService> &ref); // defined in enigma_python.i
-
 PyObject *eNavigation::getRecordings(void)
 {
-       PyObject *result = PyList_New(m_recordings.size());
+       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;
 }