X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fitem%2Fbutton.c;h=8bbdfa70406e125083dc6572acedf2f123aeb120;hp=71ca11c7c3a439327f888e8edc605b7d6fa36e35;hb=e0ac5f9f14e169a1e19d0e36b85cab061a74ed93;hpb=1c96c4a8d388a39324c24551f869f2d1e8cc4b13

diff --git a/qcsrc/menu/item/button.c b/qcsrc/menu/item/button.c
index 71ca11c7c..8bbdfa704 100644
--- a/qcsrc/menu/item/button.c
+++ b/qcsrc/menu/item/button.c
@@ -9,7 +9,7 @@ CLASS(Button) EXTENDS(Label)
 	METHOD(Button, mouseDrag, float(entity, vector))
 	METHOD(Button, mouseRelease, float(entity, vector))
 	METHOD(Button, focusEnter, void(entity))
-	ATTRIB(Button, onClick, void(entity, entity), SUB_Null)
+	ATTRIB(Button, onClick, void(entity, entity), func_null)
 	ATTRIB(Button, onClickEntity, entity, NULL)
 	ATTRIB(Button, src, string, string_null)
 	ATTRIB(Button, srcSuffix, string, string_null)
@@ -77,11 +77,12 @@ float Button_mouseRelease(entity me, vector pos)
 	me.mouseDrag(me, pos); // verify coordinates
 	if(me.pressed)
 	{
-		if not(me.disabled)
+		if (!me.disabled)
 		{
 			if(cvar("menu_sounds"))
 				localsound("sound/misc/menu2.wav");
-			me.onClick(me, me.onClickEntity);
+			if(me.onClick)
+				me.onClick(me, me.onClickEntity);
 		}
 		me.pressed = 0;
 	}
@@ -158,14 +159,15 @@ void Button_draw(entity me)
 
 	draw_alpha = save;
 
-	SUPER(Button).draw(me);
-
 	if(me.clickTime > 0 && me.clickTime <= frametime)
 	{
 		// keyboard click timer expired? Fire the event then.
-		if not(me.disabled)
-			me.onClick(me, me.onClickEntity);
+		if (!me.disabled)
+			if(me.onClick)
+				me.onClick(me, me.onClickEntity);
 	}
 	me.clickTime -= frametime;
+
+	SUPER(Button).draw(me);
 }
 #endif