fix close return values for non execing dialogs

[enigma2.git] / main / enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 64088cb5f225a98809f2d465edf8906468382290..72087c92144655f63cf6f2b981c92859cdece004 100644 (file)
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -20,7 +20,7 @@
 #include <lib/gdi/sdl.h>
 #endif
 #include <lib/gdi/epng.h>
-#include <lib/gdi/font.h> 
+#include <lib/gdi/font.h>
 #include <lib/gui/ebutton.h>
 #include <lib/gui/elabel.h>
 #include <lib/gui/elistboxcontent.h>
@@ -30,7 +30,7 @@
 #include <lib/python/connections.h>
 #include <lib/python/python.h>
 
-#include "bsod.h" 
+#include "bsod.h"
 
 #ifdef HAVE_GSTREAMER
 #include <gst/gst.h>
@@ -99,19 +99,17 @@ void keyEvent(const eRCKey &key)
 class eMain: public eApplication, public Object
 {
        eInit init;
-       
-       ePtr<eDVBResourceManager> m_mgr;
+
        ePtr<eDVBDB> m_dvbdb;
+       ePtr<eDVBResourceManager> m_mgr;
        ePtr<eDVBLocalTimeHandler> m_locale_time_handler;
-       ePtr<eComponentScan> m_scan;
        ePtr<eEPGCache> m_epgcache;
 
 public:
        eMain()
        {
                init.setRunlevel(eAutoInitNumbers::main);
-
-                               /* TODO: put into init */
+               /* TODO: put into init */
                m_dvbdb = new eDVBDB();
                m_mgr = new eDVBResourceManager();
                m_locale_time_handler = new eDVBLocalTimeHandler();
@@ -122,7 +120,7 @@ public:
        ~eMain()
        {
                m_dvbdb->saveServicelist();
-               m_scan = 0;
+               m_mgr->releaseCachedChannel();
        }
 };
 
@@ -150,7 +148,7 @@ int main(int argc, char **argv)
 
        ePython python;
        eMain main;
-       
+
 #if 1
 #ifdef SDLDC
        ePtr<gSDLDC> my_dc;
@@ -248,7 +246,10 @@ int main(int argc, char **argv)
        python.execute("mytest", "__main__");
        
        if (exit_code == 5) /* python crash */
+       {
+               eDebug("(exit code 5)");
                bsodFatal();
+       }
        
        dsk.paint();
        dsk_lcd.paint();
@@ -283,3 +284,16 @@ void quitMainloop(int exitCode)
        exit_code = exitCode;
        eApp->quit(0);
 }
+
+#include "version.h"
+
+const char *getEnigmaVersionString()
+{
+       return 
+#ifdef ENIGMA2_CHECKOUT_TAG
+               ENIGMA2_CHECKOUT_TAG
+#else
+               "HEAD"
+#endif
+                       "-" __DATE__;
+}