Tracking hover widget; cleanup

The hover widget may get deleted during event processing, so Window keeps track of it for refreshing.

TODO: Random crash when a destroyed menu is still in the onTop array (?).

1 files changed, 3 insertions, 1 deletions

diff --git a/src/ui/root.c b/src/ui/root.c
index 71f53af4..21bed366 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -271,13 +271,15 @@ void destroyPending_Root(iRoot *d) {
     setCurrent_Root(d);
     iForEach(PtrSet, i, d->pendingDestruction) {
         iWidget *widget = *i.value;
+        iAssert(widget->root == d);
         if (!isFinished_Anim(&widget->visualOffset) ||
             isBeingVisuallyOffsetByReference_Widget(widget)) {
             continue;
         }
         if (widget->flags & keepOnTop_WidgetFlag) {
-            removeOne_PtrArray(onTop_Root(widget->root), widget);
+            removeOne_PtrArray(d->onTop, widget);
         }
+        iAssert(indexOf_PtrArray(d->onTop, widget) == iInvalidPos);
         if (widget->parent) {
             removeChild_Widget(widget->parent, widget);
         }