start on device list, don't crash when list is empty

[enigma2.git] / lib / gdi / grc.cpp

diff --git a/lib/gdi/grc.cpp b/lib/gdi/grc.cpp
index 274d221bee72db9a5c82875eeddeab6f98fff719..67f0059face0513907d943e0dfc525c8b1e9b4e7 100644 (file)
--- a/lib/gdi/grc.cpp
+++ b/lib/gdi/grc.cpp
@@ -115,7 +115,11 @@ void *gRC::thread()
                        else if (o.opcode==gOpcode::notify)
                                need_notify = 1;
                        else
+                       {
                                o.dc->exec(&o);
+                               // o.dc is a gDC* filled with grabref... so we must release it here
+                               o.dc->Release();
+                       }
                }
                else
                {
@@ -237,7 +241,7 @@ void gPainter::renderText(const eRect &pos, const std::string &string, int flags
        o.dc = m_dc.grabRef();
        o.parm.renderText = new gOpcode::para::prenderText;
        o.parm.renderText->area = pos;
-       o.parm.renderText->text = string;
+       o.parm.renderText->text = string.empty()?0:strdup(string.c_str());
        o.parm.renderText->flags = flags;
        m_rc->submit(o);
 }
@@ -539,7 +543,8 @@ void gDC::exec(gOpcode *o)
                assert(m_current_font);
                para->setFont(m_current_font);
                para->renderString(o->parm.renderText->text, (flags & gPainter::RT_WRAP) ? RS_WRAP : 0);
-               
+               if (o->parm.renderText->text)
+                       free(o->parm.renderText->text);
                if (flags & gPainter::RT_HALIGN_RIGHT)
                        para->realign(eTextPara::dirRight);
                else if (flags & gPainter::RT_HALIGN_CENTER)