Avoid generating events during destruction of a widget

diff --git a/source/widget.cpp b/source/widget.cpp
index 17bc4e3c95c96a6aed1f3e5eb14129b6951fdd72..a5a0f2d511801402c611c2a55f61218483b6d67c 100644 (file)
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -30,7 +30,11 @@ Widget::Widget():
 Widget::~Widget()
 {
        if(parent)
-               parent->remove(*this);
+       {
+               Container *p = parent;
+               parent = 0;
+               p->remove(*this);
+       }
 }
 
 void Widget::set_position(int x, int y)
@@ -70,6 +74,8 @@ void Widget::set_parent(Container *p)
 {
        if(parent && p)
                throw InvalidState("Widget is already in a Container");
+       else if(p==parent)
+               return;
        parent = p;
 
        on_reparent();