Merge branch 'master' into Mario/monsters

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / item / button.qc

diff --git a/qcsrc/menu/item/button.qc b/qcsrc/menu/item/button.qc
index 77e4ccad264fee8f912abdb8573ba154af71289c..e9f418ad9c24f79063b80dd848bc9f7f056cbe46 100644 (file)
--- a/qcsrc/menu/item/button.qc
+++ b/qcsrc/menu/item/button.qc
@@ -121,8 +121,14 @@
                if (me.clickTime > 0 && me.clickTime <= frametime)
                {
                        // keyboard click timer expired? Fire the event then.
-                       if (!me.disabled)
-                               if (me.onClick) me.onClick(me, me.onClickEntity);
+                       if (!me.disabled && me.onClick)
+                       {
+                               if(me.applyButton)
+                                       me.applyButton.disabled = false;
+                               me.onClick(me, me.onClickEntity);
+                               if(me.disableOnClick)
+                                       me.disabled = true;
+                       }
                }
                me.clickTime -= frametime;