Merge branch 'bug_249_current_skin_fallback'

[vuplus_dvbapp] / main / enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 7f3ba44..3f420b4 100644 (file)
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -245,6 +245,9 @@ int main(int argc, char **argv)
 //     python.execute("mytest", "__main__");
        python.execFile("/usr/lib/enigma2/python/mytest.py");
 
+       extern void setFullsize(); // definend in lib/gui/evideo.cpp
+       setFullsize();
+
        if (exit_code == 5) /* python crash */
        {
                eDebug("(exit code 5)");
@@ -306,14 +309,21 @@ void quitMainloop(int exitCode)
 
 const char *getEnigmaVersionString()
 {
-       return 
-#ifdef ENIGMA2_CHECKOUT_TAG
-               ENIGMA2_CHECKOUT_TAG
+       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"
+               "HEAD";
 #endif
-                       "-" __DATE__;
+       return std::string(date + '-' + branch).c_str();
 }
+
 #include <malloc.h>
 
 void dump_malloc_stats(void)