Fixed a bug where the menu was not getting reset properly when gettin…

…g on another game

Hayzen/src/Core/Game.cpp

@@ -11,6 +11,17 @@ Menu Game::s_Menu;
 Option Game::s_RootOption;
 
 
+//--------------------------------------------------------------------------------------
+// Name: ~Game()
+// Desc: Stop the menu and cleanup the root option when the game is destroyed.
+//--------------------------------------------------------------------------------------
+Game::~Game()
+{
+    s_Menu.Stop();
+    s_RootOption.Cleanup();
+}
+
+
 //--------------------------------------------------------------------------------------
 // Name: Init()
 // Desc: Common initialization behavior to all games.

Hayzen/src/Core/Game.h

@@ -10,7 +10,7 @@
 class Game
 {
 public:
-    virtual ~Game() {}
+    virtual ~Game();
 
     virtual VOID Init() = 0;
 

Hayzen/src/Core/Option.cpp

@@ -38,3 +38,16 @@ VOID Option::OnClick(Menu* pMenu)
     if (!m_Children.empty())
         pMenu->SetCurrentOption(this);
 }
+
+
+//--------------------------------------------------------------------------------------
+// Name: Cleanup()
+// Desc: Reset the members.
+//--------------------------------------------------------------------------------------
+VOID Option::Cleanup()
+{
+    m_uiIndex = 0;
+    m_fnCallback = nullptr;
+    m_pParent = nullptr;
+    m_Children.clear();
+}

Hayzen/src/Core/Option.h

@@ -28,6 +28,8 @@ class Option : public Text
     Option* GetParent() CONST { return m_pParent; }
 
     CONST std::vector<std::shared_ptr<Option>>& GetChildren() CONST { return m_Children; }
+
+    VOID Cleanup();
 private:
     UINT m_uiIndex;
     Callback m_fnCallback;