widget: don't crash when deallocating in wrong order
[enigma2.git] / lib / gui / ewidget.cpp
index b4c24d8..3bc6e66 100644 (file)
@@ -32,6 +32,9 @@ void eWidget::move(ePoint pos)
        if (m_position == pos)
                return;
 
+                       /* ?? what about native move support? */
+       invalidate();
+
        m_position = pos;
        
        event(evtChangedPosition);
@@ -137,6 +140,8 @@ void eWidget::hide()
        while (root && !root->m_desktop)
        {
                root = root->m_parent;
+               if (!root)
+                       return;
                abspos += root->position();
        }
        assert(root->m_desktop);
@@ -202,12 +207,11 @@ eWidget::~eWidget()
 
        m_parent = 0;
 
-               /* destroy all childs */
+               /* tell all childs that the parent is not anymore existing */
        ePtrList<eWidget>::iterator i(m_childs.begin());
        while (i != m_childs.end())
        {
-               (*i)->m_parent = 0;
-               delete *i;
+               (*i)->parentRemoved();
                i = m_childs.erase(i);
        }
 }
@@ -272,6 +276,11 @@ void eWidget::recalcClipRegionsWhenVisible()
        } while(1);
 }
 
+void eWidget::parentRemoved()
+{
+       m_parent = 0;
+}
+
 int eWidget::event(int event, void *data, void *data2)
 {
        switch (event)
@@ -294,6 +303,10 @@ int eWidget::event(int event, void *data, void *data2)
                                painter.setBackgroundColor(m_background_color);
                                painter.clear();
                        }
+               } else
+               {
+                       if (m_have_background_color)
+                               painter.setBackgroundColor(m_background_color);
                }
                break;
        }