fixup! Store the optional Exit button into a std::optional<TitleButton*>

Author: PringlesGang

src/games/cclcc/titlemenu.cpp

@@ -144,11 +144,12 @@ TitleMenu::TitleMenu() {
 
   if (HasScriptedExitLogic) {
     // Exit menu button (Configuration/Patch driven)
-    Exit.emplace(new TitleButton(
+    auto* const exitPtr = new TitleButton(
         5, ExitSprite, ExitSprite, ItemHighlightSprite,
-        glm::vec2(ItemHighlightOffsetX, (ItemYBase + (5 * ItemPadding)))));
+        glm::vec2(ItemHighlightOffsetX, (ItemYBase + (5 * ItemPadding))));
+    Exit.emplace(*exitPtr);
     setupBtn(
-        *Exit,
+        exitPtr,
         [this](Widgets::Button* target) { return ExitButtonOnClick(target); },
         MainItems, FDIR_DOWN);
   }
@@ -697,7 +698,7 @@ void TitleMenu::ShowContinueItems() {
   Extra->Move(glm::vec2(0.0f, ItemPadding));
   Config->Move(glm::vec2(0.0f, ItemPadding));
   Help->Move(glm::vec2(0.0f, ItemPadding));
-  if (Exit.has_value()) (*Exit)->Move(glm::vec2(0.0f, ItemPadding));
+  if (Exit.has_value()) Exit->get().Move(glm::vec2(0.0f, ItemPadding));
   ContinueItems->Move(glm::vec2(Profile::DesignWidth / 2, 0.0f),
                       SecondaryFadeAnimation.DurationOut);
 }
@@ -711,7 +712,7 @@ void TitleMenu::HideContinueItems() {
   Extra->Move(glm::vec2(0.0f, -ItemPadding));
   Config->Move(glm::vec2(0.0f, -ItemPadding));
   Help->Move(glm::vec2(0.0f, -ItemPadding));
-  if (Exit.has_value()) (*Exit)->Move(glm::vec2(0.0f, -ItemPadding));
+  if (Exit.has_value()) Exit->get().Move(glm::vec2(0.0f, -ItemPadding));
 }
 
 void TitleMenu::ShowExtraItems() {
@@ -727,7 +728,7 @@ void TitleMenu::ShowExtraItems() {
 
   Config->Move(glm::vec2(0, ItemPadding));
   Help->Move(glm::vec2(0, ItemPadding));
-  if (Exit.has_value()) (*Exit)->Move(glm::vec2(0, ItemPadding));
+  if (Exit.has_value()) Exit->get().Move(glm::vec2(0, ItemPadding));
   ExtraItems->Move({Profile::DesignWidth / 2, 0.0f},
                    SecondaryFadeAnimation.DurationIn);
 }
@@ -741,7 +742,7 @@ void TitleMenu::HideExtraItems() {
   AllowsScriptInput = true;
   Config->Move(glm::vec2(0, -ItemPadding));
   Help->Move(glm::vec2(0, -ItemPadding));
-  if (Exit.has_value()) (*Exit)->Move(glm::vec2(0, -ItemPadding));
+  if (Exit.has_value()) Exit->get().Move(glm::vec2(0, -ItemPadding));
   Config->Enabled = true;
   Help->Enabled = true;
 }

src/games/cclcc/titlemenu.h

@@ -44,7 +44,7 @@ class TitleMenu : public Menu {
   Widgets::CCLCC::TitleButton* Extra;
   Widgets::CCLCC::TitleButton* Config;
   Widgets::CCLCC::TitleButton* Help;
-  std::optional<Widgets::CCLCC::TitleButton*> Exit;
+  std::optional<std::reference_wrapper<Widgets::CCLCC::TitleButton>> Exit;
   Widgets::Label* MenuLabel;
 
   Widgets::Group* ContinueItems;

src/games/chlcc/titlemenu.cpp

@@ -91,14 +91,16 @@ TitleMenu::TitleMenu() {
 
   // Exit menu button (Configuration/Patch driven)
   if (HasScriptedExitLogic) {
-    Exit.emplace(
+    auto* const exitPtr =
         new TitleButton(4, ExitSprite, ExitHighlightSprite, ItemHighlightSprite,
                         glm::vec2(ItemHighlightOffset.x - 1.0f,
-                                  ItemYBase - 1.0f + 4 * ItemPadding)));
-    (*Exit)->OnClickHandler = [this](auto* btn) {
+                                  ItemYBase - 1.0f + 4 * ItemPadding));
+    exitPtr->OnClickHandler = [this](auto* btn) {
       return ExitButtonOnClick(btn);
     };
-    MainItems->Add(*Exit, FDIR_DOWN);
+
+    Exit.emplace(*exitPtr);
+    MainItems->Add(exitPtr, FDIR_DOWN);
   }
 
   // Quick Load secondary Load menu button

src/games/chlcc/titlemenu.h

@@ -54,7 +54,7 @@ class TitleMenu : public Menu {
   Widgets::CHLCC::TitleButton* Load;
   Widgets::CHLCC::TitleButton* Extra;
   Widgets::CHLCC::TitleButton* System;
-  std::optional<Widgets::CHLCC::TitleButton*> Exit;
+  std::optional<std::reference_wrapper<Widgets::CHLCC::TitleButton>> Exit;
 
   Widgets::Group* LoadItems;
   Widgets::CHLCC::TitleButton* SubLoad;