X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2FmodalMenu.h;h=1f6d4d897dfe6126d0a69a8c375c50a4188edaab;hb=013921782b1a8506f4aee1d1be0312002eddd575;hp=2323a7e427cab7cf298f7d0e983bf5d7468abc6d;hpb=c914cbb0a081b30b28271618bbaa8e987a108ae7;p=oweals%2Fminetest.git

diff --git a/src/modalMenu.h b/src/modalMenu.h
index 2323a7e42..1f6d4d897 100644
--- a/src/modalMenu.h
+++ b/src/modalMenu.h
@@ -46,6 +46,8 @@ public:
 		IGUIElement(gui::EGUIET_ELEMENT, env, parent, id,
 				core::rect<s32>(0,0,100,100))
 	{
+		//m_force_regenerate_gui = false;
+		
 		m_menumgr = menumgr;
 		m_allow_focus_removal = false;
 		m_screensize_old = v2u32(0,0);
@@ -76,17 +78,21 @@ public:
 			
 		video::IVideoDriver* driver = Environment->getVideoDriver();
 		v2u32 screensize = driver->getScreenSize();
-		if(screensize != m_screensize_old)
+		if(screensize != m_screensize_old /*|| m_force_regenerate_gui*/)
 		{
 			m_screensize_old = screensize;
 			regenerateGui(screensize);
+			//m_force_regenerate_gui = false;
 		}
 
 		drawMenu();
 	}
 	
 	/*
-		This should be called when the menu wants to quit
+		This should be called when the menu wants to quit.
+
+		WARNING: THIS DEALLOCATES THE MENU FROM MEMORY. Return
+		immediately if you call this from the menu itself.
 	*/
 	void quitMenu()
 	{
@@ -116,7 +122,9 @@ public:
 	virtual void regenerateGui(v2u32 screensize) = 0;
 	virtual void drawMenu() = 0;
 	virtual bool OnEvent(const SEvent& event) { return false; };
-	
+
+protected:
+	//bool m_force_regenerate_gui;
 private:
 	IMenuManager *m_menumgr;
 	// This might be necessary to expose to the implementation if it