X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/94e20b4fa99280fc8fb0d7c4753286cefc32b114..68a0e8a6af4fce4f9873ce7c5c9ac93baffd7af2:/main/enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index e669b19b..9c2a5ed6 100644
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -145,12 +145,18 @@ public:
 
 eLabel *lcd_label, *lcd_clock;
 
+int exit_code;
+
 int main(int argc, char **argv)
 {
 #ifdef OBJECT_DEBUG
 	atexit(object_dump);
 #endif
 
+	// set pythonpath if unset
+	setenv("PYTHONPATH", LIBDIR "/enigma2/python", 0);
+	printf("PYTHONPATH: %s\n", getenv("PYTHONPATH"));
+
 
 	ePython python;
 	eMain main;
@@ -176,11 +182,11 @@ int main(int argc, char **argv)
 	eWidgetDesktop dsk(eSize(720, 576));
 	eWidgetDesktop dsk_lcd(eSize(132, 64));
 	
-	if (double_buffer)
+/*	if (double_buffer)
 	{
 		eDebug(" - double buffering found, enable buffered graphics mode.");
 		dsk.setCompositionMode(eWidgetDesktop::cmBuffered);
-	}
+	} */
 	
 	wdsk = &dsk;
 	lcddsk = &dsk_lcd;
@@ -189,10 +195,10 @@ int main(int argc, char **argv)
 	dsk_lcd.setDC(my_lcd_dc);
 
 	ePtr<gPixmap> m_pm;
-	loadPNG(m_pm, "data/pal.png");
+	loadPNG(m_pm, DATADIR "/enigma2/pal.png");
 	if (!m_pm)
 	{
-		eFatal("hi ghost, please copy pal.png into your ./data, thanks!");
+		eFatal("pal.png not found!");
 	} else
 		dsk.setPalette(*m_pm);
 
@@ -235,7 +241,7 @@ int main(int argc, char **argv)
 
 //	eApp->exec();
 
-	return 0;
+	return exit_code;
 }
 
 eWidgetDesktop *getDesktop()
@@ -245,12 +251,12 @@ eWidgetDesktop *getDesktop()
 
 void runMainloop()
 {
-	eApp->exec();
+	exit_code = eApp->exec();
 }
 
-void quitMainloop()
+void quitMainloop(int exitCode)
 {
-	eApp->quit(0);
+	eApp->quit(exitCode);
 }
 
 void setLCD(const char *string)