Merge branch 'master' into 'master'

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

diff --git a/qcsrc/menu/item/dialog.qc b/qcsrc/menu/item/dialog.qc
index c4a78fa568802c305e763aedca9e96eb59bfb595..9e0ea95ebad6dc9555357c310f01a0c9ac9ad793 100644 (file)
--- a/qcsrc/menu/item/dialog.qc
+++ b/qcsrc/menu/item/dialog.qc
@@ -103,8 +103,17 @@
 
        void Dialog_close(entity me)
        {
-               if (me.parent.instanceOfNexposee) ExposeeCloseButton_Click(me, me.parent);
-               else if (me.parent.instanceOfModalController) DialogCloseButton_Click(me, me);
+               if (me.parent.instanceOfNexposee)
+               {
+                       ExposeeCloseButton_Click(me, me.parent);
+                       if(me.hideMenuOnClose)
+                       {
+                               me.hideMenuOnClose = false;
+                               m_hide();
+                       }
+               }
+               else if (me.parent.instanceOfModalController)
+                       DialogCloseButton_Click(me, me);
        }
 
        float Dialog_keyDown(entity me, float key, float ascii, float shift)
@@ -118,5 +127,8 @@
                                return 1;
                        }
                }
-               return SUPER(Dialog).keyDown(me, key, ascii, shift);
+               float r = SUPER(Dialog).keyDown(me, key, ascii, shift);
+               if (!me.closable && key == K_ESCAPE)
+                       return 1;
+               return r;
        }