X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fmenu.qc;h=7bec34ea0b0a1ff91aad1c9ed91d051f34ca7fc9;hb=0b477ef3d8dde4db94a9600c10d8f789ab2794b7;hp=b8fee02a13263a8b9e24a7b43359c150bc1f9dad;hpb=715202f719f244160bfc0b004013fa6e1bcc5668;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc
index b8fee02a1..7bec34ea0 100644
--- a/qcsrc/menu/menu.qc
+++ b/qcsrc/menu/menu.qc
@@ -270,6 +270,9 @@ void draw_Picture_Aligned(vector algn, float scalemode, string img, float a)
 
 void(string img, float a, string algn, float force1) drawBackground =
 {
+	if(main.mainNexposee.ModalController_state == 0)
+		return;
+
 	vector v;
 	float i, l;
 	string c;
@@ -759,8 +762,9 @@ void() m_shutdown =
 	m_hide();
 	for(e = NULL; (e = nextent(e)) != NULL; )
 	{
-		if(e.destroy)
-			e.destroy(e);
+		if(e.classname != "vtbl")
+			if(e.destroy)
+				e.destroy(e);
 	}
 };
 
@@ -792,7 +796,7 @@ void m_activate_window(entity wnd)
 		// nexposee (sorry for violating abstraction here)
 		par.selectedChild = wnd;
 		par.animationState = 1;
-		setFocusContainer(par, NULL);
+		Container_setFocus(par, NULL);
 	}
 	else if(par.instanceOfContainer)
 	{