Fix memory leaks due to messed up memory handling for particles as well as their...

[minetest.git] / src / modalMenu.h

diff --git a/src/modalMenu.h b/src/modalMenu.h
index d19b4e27cb4d33e0966d7313cbd08a9e0b6e2053..72ecedcb9ca7e32e286548457b2cfff6734cc872 100644 (file)
--- a/src/modalMenu.h
+++ b/src/modalMenu.h
@@ -21,6 +21,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define MODALMENU_HEADER
 
 #include "irrlichttypes_extrabloated.h"
+#ifdef HAVE_TOUCHSCREENGUI
+#include "touchscreengui.h"
+#endif
 
 class GUIModalMenu;
 
@@ -93,13 +96,20 @@ class GUIModalMenu : public gui::IGUIElement
 
                WARNING: THIS DEALLOCATES THE MENU FROM MEMORY. Return
                immediately if you call this from the menu itself.
+
+               (More precisely, this decrements the reference count.)
        */
        void quitMenu()
        {
                allowFocusRemoval(true);
                // This removes Environment's grab on us
                Environment->removeFocus(this);
+               m_menumgr->deletingMenu(this);
                this->remove();
+#ifdef HAVE_TOUCHSCREENGUI
+               if (g_touchscreengui)
+                       g_touchscreengui->Show();
+#endif
        }
 
        void removeChildren()
@@ -121,7 +131,9 @@ class GUIModalMenu : public gui::IGUIElement
 
        virtual void regenerateGui(v2u32 screensize) = 0;
        virtual void drawMenu() = 0;
+       virtual bool preprocessEvent(const SEvent& event) { return false; };
        virtual bool OnEvent(const SEvent& event) { return false; };
+       virtual bool pausesGame(){ return false; } // Used for pause menu
 
 protected:
        //bool m_force_regenerate_gui;