git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
enigma.cpp: add missing semicolon
[enigma2.git]
/
main
/
enigma.cpp
diff --git
a/main/enigma.cpp
b/main/enigma.cpp
index 0893b035f74cb4cbf814f8ccfbb1f95579022ba9..3f420b4bb6ee2e996e5a863dc42d457fc8073ae5 100644
(file)
--- a/
main/enigma.cpp
+++ b/
main/enigma.cpp
@@
-213,7
+213,7
@@
int main(int argc, char **argv)
ePtr<gPixmap> wait[MAX_SPINNER];
for (i=0; i<MAX_SPINNER; ++i)
{
ePtr<gPixmap> wait[MAX_SPINNER];
for (i=0; i<MAX_SPINNER; ++i)
{
- char filename[strlen(DATADIR) +
20
];
+ char filename[strlen(DATADIR) +
41
];
sprintf(filename, DATADIR "/enigma2/skin_default/spinner/wait%d.png", i + 1);
loadPNG(wait[i], filename);
sprintf(filename, DATADIR "/enigma2/skin_default/spinner/wait%d.png", i + 1);
loadPNG(wait[i], filename);
@@
-245,10
+245,13
@@
int main(int argc, char **argv)
// python.execute("mytest", "__main__");
python.execFile("/usr/lib/enigma2/python/mytest.py");
// 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)");
if (exit_code == 5) /* python crash */
{
eDebug("(exit code 5)");
- bsodFatal();
+ bsodFatal(
0
);
}
dsk.paint();
}
dsk.paint();
@@
-306,14
+309,21
@@
void quitMainloop(int exitCode)
const char *getEnigmaVersionString()
{
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
#else
- "HEAD"
+ "HEAD"
;
#endif
#endif
-
"-" __DATE__
;
+
return std::string(date + '-' + branch).c_str()
;
}
}
+
#include <malloc.h>
void dump_malloc_stats(void)
#include <malloc.h>
void dump_malloc_stats(void)