Merge remote-tracking branch 'origin/master' into samual/combined_updates

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / item / modalcontroller.c

diff --git a/qcsrc/menu/item/modalcontroller.c b/qcsrc/menu/item/modalcontroller.c
index 82bd6f62b8cdf1284d16b6df0a3d4c7ae7994a32..5a5541dc7b0da4706800380998b531d67e5de329 100644 (file)
--- a/qcsrc/menu/item/modalcontroller.c
+++ b/qcsrc/menu/item/modalcontroller.c
@@ -144,6 +144,7 @@ void ModalController_draw(entity me)
        vector fs;
        animating = 0;
 
+       front = world;
        for(e = me.firstChild; e; e = e.nextSibling)
                if(e.ModalController_state)
                {
@@ -227,7 +228,7 @@ void ModalController_draw(entity me)
        else
                me.setFocus(me, front);
        SUPER(ModalController).draw(me);
-};
+}
 
 void ModalController_addTab(entity me, entity other, entity tabButton)
 {