Merge remote-tracking branch 'origin/bug_785_fix_rtl_group_epg'

[enigma2.git] / main / enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 3ea4afb71226129e6b5792c81875163eee249d92..91645d893b9f0b694a2a91927d6ff67d59105ce1 100644 (file)
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -28,6 +28,7 @@
 #include <lib/python/python.h>
 
 #include "bsod.h"
+#include "version_info.h"
 
 #include <gst/gst.h>
 
@@ -250,8 +251,9 @@ int main(int argc, char **argv)
 
        {
                gPainter p(my_lcd_dc);
-               p.resetClip(eRect(0, 0, 132, 64));
+               p.resetClip(eRect(ePoint(0, 0), my_lcd_dc->size()));
                p.clear();
+               p.flush();
        }
 
        return exit_code;
@@ -267,11 +269,6 @@ eApplication *getApplication()
        return eApp;
 }
 
-void runMainloop()
-{
-       eApp->runLoop();
-}
-
 void quitMainloop(int exitCode)
 {
        FILE *f = fopen("/proc/stb/fp/was_timer_wakeup", "w");
@@ -296,22 +293,30 @@ void quitMainloop(int exitCode)
        eApp->quit(0);
 }
 
-#include "version.h"
+static void sigterm_handler(int num)
+{
+       quitMainloop(128 + num);
+}
+
+void runMainloop()
+{
+       struct sigaction act;
+
+       act.sa_handler = sigterm_handler;
+       act.sa_flags = SA_RESTART;
+
+       if (sigemptyset(&act.sa_mask) == -1)
+               perror("sigemptyset");
+       if (sigaction(SIGTERM, &act, 0) == -1)
+               perror("SIGTERM");
+
+       eApp->runLoop();
+}
 
 const char *getEnigmaVersionString()
 {
-       std::string date =
-#ifdef ENIGMA2_LAST_CHANGE_DATE
-               ENIGMA2_LAST_CHANGE_DATE;
-#else
-               __DATE__;
-#endif
-       std::string branch =
-#ifdef ENIGMA2_BRANCH
-               ENIGMA2_BRANCH;
-#else
-               "HEAD";
-#endif
+       std::string date = enigma2_date;
+       std::string branch = enigma2_branch;
        return std::string(date + '-' + branch).c_str();
 }