From 4409476ac1ac3c37df16b8d773e7436ab875e7a2 Mon Sep 17 00:00:00 2001 From: darkrose Date: Thu, 19 Mar 2015 16:47:05 +1000 Subject: [PATCH] piston tweaks --- src/guiDeathScreen.cpp | 1 - src/guiFormSpecMenu.cpp | 1 - src/guiKeyChangeMenu.cpp | 1 - src/guiMainMenu.cpp | 1 - src/guiMessageMenu.cpp | 1 - src/guiPasswordChange.cpp | 1 - src/guiPauseMenu.cpp | 1 - src/guiTextInputMenu.cpp | 1 - 8 files changed, 8 deletions(-) diff --git a/src/guiDeathScreen.cpp b/src/guiDeathScreen.cpp index 1dcc1b4..81a307e 100644 --- a/src/guiDeathScreen.cpp +++ b/src/guiDeathScreen.cpp @@ -49,7 +49,6 @@ GUIDeathScreen::GUIDeathScreen(gui::IGUIEnvironment* env, GUIDeathScreen::~GUIDeathScreen() { removeChildren(); - m_menumgr->deletingMenu(this); delete m_respawner; } diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp index 9059941..7e3b720 100644 --- a/src/guiFormSpecMenu.cpp +++ b/src/guiFormSpecMenu.cpp @@ -115,7 +115,6 @@ GUIFormSpecMenu::GUIFormSpecMenu(gui::IGUIEnvironment* env, GUIFormSpecMenu::~GUIFormSpecMenu() { removeChildren(); - m_menumgr->deletingMenu(this); delete m_selected_item; delete m_form_io; diff --git a/src/guiKeyChangeMenu.cpp b/src/guiKeyChangeMenu.cpp index 5b2b9a7..e5f4ace 100644 --- a/src/guiKeyChangeMenu.cpp +++ b/src/guiKeyChangeMenu.cpp @@ -49,7 +49,6 @@ GUIKeyChangeMenu::GUIKeyChangeMenu(gui::IGUIEnvironment* env, GUIKeyChangeMenu::~GUIKeyChangeMenu() { removeChildren(); - m_menumgr->deletingMenu(this); } void GUIKeyChangeMenu::removeChildren() diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp index 7dfcb2f..6ef0714 100644 --- a/src/guiMainMenu.cpp +++ b/src/guiMainMenu.cpp @@ -66,7 +66,6 @@ GUIMainMenu::GUIMainMenu(gui::IGUIEnvironment* env, GUIMainMenu::~GUIMainMenu() { removeChildren(); - m_menumgr->deletingMenu(this); } void GUIMainMenu::removeChildren() diff --git a/src/guiMessageMenu.cpp b/src/guiMessageMenu.cpp index 5aea241..4125f08 100644 --- a/src/guiMessageMenu.cpp +++ b/src/guiMessageMenu.cpp @@ -50,7 +50,6 @@ GUIMessageMenu::GUIMessageMenu(gui::IGUIEnvironment* env, GUIMessageMenu::~GUIMessageMenu() { removeChildren(); - m_menumgr->deletingMenu(this); } void GUIMessageMenu::removeChildren() diff --git a/src/guiPasswordChange.cpp b/src/guiPasswordChange.cpp index 52e8a9c..bc7c208 100644 --- a/src/guiPasswordChange.cpp +++ b/src/guiPasswordChange.cpp @@ -58,7 +58,6 @@ GUIPasswordChange::GUIPasswordChange(gui::IGUIEnvironment* env, GUIPasswordChange::~GUIPasswordChange() { removeChildren(); - m_menumgr->deletingMenu(this); } void GUIPasswordChange::removeChildren() diff --git a/src/guiPauseMenu.cpp b/src/guiPauseMenu.cpp index 1e40c53..3943a48 100644 --- a/src/guiPauseMenu.cpp +++ b/src/guiPauseMenu.cpp @@ -50,7 +50,6 @@ GUIPauseMenu::GUIPauseMenu(gui::IGUIEnvironment* env, GUIPauseMenu::~GUIPauseMenu() { removeChildren(); - m_menumgr->deletingMenu(this); } void GUIPauseMenu::removeChildren() diff --git a/src/guiTextInputMenu.cpp b/src/guiTextInputMenu.cpp index 5d06e71..bd92734 100644 --- a/src/guiTextInputMenu.cpp +++ b/src/guiTextInputMenu.cpp @@ -55,7 +55,6 @@ GUITextInputMenu::~GUITextInputMenu() if (m_io) delete m_io; removeChildren(); - m_menumgr->deletingMenu(this); } void GUITextInputMenu::removeChildren()