X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=main%2Fbsod.cpp;h=4c056b318757799eddff06624b66dbf8ddbdc35a;hp=5b01c7c1631ad390f44c50cdcf57549cdf6bb221;hb=HEAD;hpb=d98f00f0fdd8b95b819b17c1d4779610c657c198

diff --git a/main/bsod.cpp b/main/bsod.cpp
index 5b01c7c..4c056b3 100644
--- a/main/bsod.cpp
+++ b/main/bsod.cpp
@@ -18,7 +18,11 @@
 
 /************************************************/
 
+#ifdef BUILD_VUPLUS
+#define CRASH_EMAILADDR "crashlog"
+#else
 #define CRASH_EMAILADDR "crashlog@dream-multimedia-tv.de"
+#endif
 #define INFOFILE "/maintainer.info"
 
 #define RINGBUFFER_SIZE 16384
@@ -200,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");
@@ -217,7 +221,7 @@ void bsodFatal(const char *component)
 
 	ePtr<gMainDC> my_dc;
 	gMainDC::getInstance(my_dc);
-	
+    
 	gPainter p(my_dc);
 	p.resetOffset();
 	p.resetClip(eRect(ePoint(0, 0), my_dc->size()));
@@ -229,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);
@@ -316,5 +320,5 @@ void bsodCatchSignals()
 
 void bsodLogInit()
 {
-	logOutput.connect(addToLogbuffer);
+	logConnection = logOutput.connect(addToLogbuffer);
 }