X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=main%2Fbsod.cpp;h=f55939ed1ee872343a15b3b65ea57a74faab1870;hp=4e0dc3a5dd77b195d0901c8da8290fedc8b3f7d7;hb=b72c9852440926ac82fd4ca3186278edd7167427;hpb=95bedbb37f1e0d0d8ba0ea68e0580d3e789471f1 diff --git a/main/bsod.cpp b/main/bsod.cpp index 4e0dc3a..f55939e 100644 --- a/main/bsod.cpp +++ b/main/bsod.cpp @@ -18,7 +18,11 @@ /************************************************/ +#ifdef BUILD_VUPLUS /* ikseong */ +#define CRASH_EMAILADDR "crashlog" +#else #define CRASH_EMAILADDR "crashlog@dream-multimedia-tv.de" +#endif #define INFOFILE "/maintainer.info" #define RINGBUFFER_SIZE 16384 @@ -173,6 +177,7 @@ void bsodFatal(const char *component) xml.string("contactemail", crash_emailaddr); xml.comment("Please email this crashlog to above address"); + xml.string("skin", getConfigString("config.skin.primary_skin", "Default Skin")); xml.string("sourcedate", enigma2_date); xml.string("branch", enigma2_branch); xml.string("rev", enigma2_rev); @@ -199,9 +204,9 @@ void bsodFatal(const char *component) xml.close(); xml.open("software"); - xml.cDataFromCmd("enigma2software", "ipkg list_installed | grep enigma2"); - xml.cDataFromCmd("dreamboxsoftware", "ipkg list_installed | grep dream"); - xml.cDataFromCmd("gstreamersoftware", "ipkg list_installed | grep gst"); + xml.cDataFromCmd("enigma2software", "opkg list_installed | grep enigma2"); + xml.cDataFromCmd("dreamboxsoftware", "opkg list_installed | grep dream"); + xml.cDataFromCmd("gstreamersoftware", "opkg list_installed | grep gst"); xml.close(); xml.open("crashlogs"); @@ -216,7 +221,7 @@ void bsodFatal(const char *component) ePtr my_dc; gMainDC::getInstance(my_dc); - + gPainter p(my_dc); p.resetOffset(); p.resetClip(eRect(ePoint(0, 0), my_dc->size())); @@ -228,11 +233,11 @@ void bsodFatal(const char *component) p.clear(); eRect usable_area = eRect(100, 70, my_dc->size().width() - 150, 100); - - std::string text("We are really sorry. Your Dreambox encountered " + + std::string text("We are really sorry. Your STB encountered " "a software problem, and needs to be restarted. " "Please send the logfile created in /hdd/ to " + crash_emailaddr + ".\n" - "Your Dreambox restarts in 10 seconds!\n" + "Your STB restarts in 10 seconds!\n" "Component: " + crash_component); p.renderText(usable_area, text.c_str(), gPainter::RT_WRAP|gPainter::RT_HALIGN_LEFT);