X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fitem%2Fmodalcontroller.c;h=8a025cb330302215489cbe3bb62d290c33ad7b22;hb=b0a06888ff894f9d334f6277b996f98ae8a665a0;hp=82bd6f62b8cdf1284d16b6df0a3d4c7ae7994a32;hpb=fe088fcfe2e0ca4b2fef755d3f1a11823f2fb220;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/item/modalcontroller.c b/qcsrc/menu/item/modalcontroller.c
index 82bd6f62b..8a025cb33 100644
--- a/qcsrc/menu/item/modalcontroller.c
+++ b/qcsrc/menu/item/modalcontroller.c
@@ -2,7 +2,6 @@
 CLASS(ModalController) EXTENDS(Container)
 	METHOD(ModalController, resizeNotify, void(entity, vector, vector, vector, vector))
 	METHOD(ModalController, draw, void(entity))
-	METHOD(ModalController, addItem, void(entity, entity, vector, vector, float))
 	METHOD(ModalController, showChild, void(entity, entity, vector, vector, float))
 	METHOD(ModalController, hideChild, void(entity, entity, float))
 	METHOD(ModalController, hideAll, void(entity, float))
@@ -87,6 +86,8 @@ void DialogOpenButton_Click_withCoords(entity button, entity tab, vector theOrig
 		return;
 	if(button)
 		button.forcePressed = 1;
+	if(tab.parent.focusedChild)
+		tab.parent.focusedChild.saveFocus(tab.parent.focusedChild);
 	tab.ModalController_controllingButton = button;
 	tab.parent.showChild(tab.parent, tab, theOrigin, theSize, 0);
 }
@@ -144,6 +145,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 +229,7 @@ void ModalController_draw(entity me)
 	else
 		me.setFocus(me, front);
 	SUPER(ModalController).draw(me);
-};
+}
 
 void ModalController_addTab(entity me, entity other, entity tabButton)
 {