projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'dm/experimental' into test
[vuplus_dvbapp]
/
main
/
bsod.cpp
diff --git
a/main/bsod.cpp
b/main/bsod.cpp
index
45f97c6
..
af4492f
100755
(executable)
--- a/
main/bsod.cpp
+++ b/
main/bsod.cpp
@@
-15,7
+15,11
@@
/************************************************/
/************************************************/
+#ifdef BUILD_VUPLUS /* ikseong */
+#define CRASH_EMAILADDR "crashlog"
+#else
#define CRASH_EMAILADDR "crashlog@dream-multimedia-tv.de"
#define CRASH_EMAILADDR "crashlog@dream-multimedia-tv.de"
+#endif
#define STDBUFFER_SIZE 512
#define RINGBUFFER_SIZE 16384
static char ringbuffer[RINGBUFFER_SIZE];
#define STDBUFFER_SIZE 512
#define RINGBUFFER_SIZE 16384
static char ringbuffer[RINGBUFFER_SIZE];
@@
-234,6
+238,13
@@
void bsodFatal(const char *component)
#endif
fprintf(f, "\t\t<contactemail>%s</contactemail>\n", crash_emailaddr);
fprintf(f, "\t\t<!-- Please email this crashlog to above address -->\n");
#endif
fprintf(f, "\t\t<contactemail>%s</contactemail>\n", crash_emailaddr);
fprintf(f, "\t\t<!-- Please email this crashlog to above address -->\n");
+ std::string activeSkin = getConfigFileValue("config.skin.primary_skin");
+ if (activeSkin != "Error")
+ {
+ if (activeSkin == "")
+ activeSkin = "Default Skin";
+ fprintf(f, "\t\t<skin>%s</skin>\n", activeSkin.c_str());
+ }
fprintf(f, "\t</enigma2>\n");
fprintf(f, "\t<image>\n");
fprintf(f, "\t</enigma2>\n");
fprintf(f, "\t<image>\n");
@@
-379,10
+390,18
@@
void bsodFatal(const char *component)
eRect usable_area = eRect(100, 70, my_dc->size().width() - 150, 100);
char text[512];
eRect usable_area = eRect(100, 70, my_dc->size().width() - 150, 100);
char text[512];
+#ifdef BUILD_VUPLUS /* ikseong */
+ snprintf(text, 512, "We are really sorry. Your STB encountered "
+#else
snprintf(text, 512, "We are really sorry. Your Dreambox encountered "
snprintf(text, 512, "We are really sorry. Your Dreambox encountered "
+#endif
"a software problem, and needs to be restarted. "
"Please send the logfile created in /hdd/ to %s.\n"
"a software problem, and needs to be restarted. "
"Please send the logfile created in /hdd/ to %s.\n"
+#ifdef BUILD_VUPLUS /* ikseong */
+ "Your STB restarts in 10 seconds!\n"
+#else
"Your Dreambox restarts in 10 seconds!\n"
"Your Dreambox restarts in 10 seconds!\n"
+#endif
"Component: %s",
crash_emailaddr, crash_component);
"Component: %s",
crash_emailaddr, crash_component);