fix small memleak

[enigma2.git] / main / enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 631a3fb25561c4d56ae2430546b0080bab2ba64e..cf9120724ddb5014aa5de36f90d2796df7e57644 100644 (file)
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -1,7 +1,3 @@
-#ifdef WITH_SDL
-#define SDLDC
-#endif
-
 #include <stdio.h>
 #include <unistd.h>
 #include <libsig_comp.h>
@@ -20,7 +16,7 @@
 #include <lib/gdi/sdl.h>
 #endif
 #include <lib/gdi/epng.h>
-#include <lib/gdi/font.h> 
+#include <lib/gdi/font.h>
 #include <lib/gui/ebutton.h>
 #include <lib/gui/elabel.h>
 #include <lib/gui/elistboxcontent.h>
@@ -30,7 +26,7 @@
 #include <lib/python/connections.h>
 #include <lib/python/python.h>
 
-#include "bsod.h" 
+#include "bsod.h"
 
 #ifdef HAVE_GSTREAMER
 #include <gst/gst.h>
@@ -150,7 +146,7 @@ int main(int argc, char **argv)
        eMain main;
 
 #if 1
-#ifdef SDLDC
+#ifdef WITH_SDL
        ePtr<gSDLDC> my_dc;
        gSDLDC::getInstance(my_dc);
 #else
@@ -191,7 +187,7 @@ int main(int argc, char **argv)
        dsk_lcd.setDC(my_lcd_dc);
 
        ePtr<gPixmap> m_pm;
-       loadPNG(m_pm, DATADIR "/enigma2/pal.png");
+       loadPNG(m_pm, DATADIR "/enigma2/skin_default/pal.png");
        if (!m_pm)
        {
                eFatal("pal.png not found!");
@@ -215,7 +211,7 @@ int main(int argc, char **argv)
                for (i=0; i<MAX_SPINNER; ++i)
                {
                        char filename[strlen(DATADIR) + 20];
-                       sprintf(filename, DATADIR "/enigma2/wait%d.png", i + 1);
+                       sprintf(filename, DATADIR "/enigma2/skin_default/spinner/wait%d.png", i + 1);
                        loadPNG(wait[i], filename);
                        
                        if (!wait[i])
@@ -246,7 +242,10 @@ int main(int argc, char **argv)
        python.execute("mytest", "__main__");
        
        if (exit_code == 5) /* python crash */
+       {
+               eDebug("(exit code 5)");
                bsodFatal();
+       }
        
        dsk.paint();
        dsk_lcd.paint();
@@ -255,7 +254,6 @@ int main(int argc, char **argv)
                gPainter p(my_lcd_dc);
                p.resetClip(eRect(0, 0, 132, 64));
                p.clear();
-               p.flush();
        }
 
        return exit_code;