Save Entries Refresh Info Fix

- Lock updates during saving
- Remove redundant MainItems field 🐫

Author: Gunoshozo

src/games/chlcc/savemenu.cpp

@@ -38,6 +38,7 @@ void SaveMenu::MenuButtonOnClick(Widgets::Button* target) {
             SaveSystem::GetSaveFlags(EntryType, ScrWork[SW_SAVEFILENO]) &
                 SaveSystem::SaveFlagsMode::WriteProtect);
     ChoiceMade = true;
+    LockInputs = *ActiveMenuType == +SaveMenuPageType::Save;
   }
 }
 
@@ -69,8 +70,8 @@ SaveMenu::SaveMenu() : UI::SaveMenu() {
   // Quick Save Pages initialization
 
   for (int i = 0; i < Pages; i++) {
-    MainItems = new Widgets::Group(this);
-    MainItems->WrapFocus = false;
+    Widgets::Group* mainItems = new Widgets::Group(this);
+    mainItems->WrapFocus = false;
 
     for (int j = 0; j < EntriesPerPage; j++) {
       SaveEntryButton* saveEntryButton =
@@ -79,7 +80,7 @@ SaveMenu::SaveMenu() : UI::SaveMenu() {
                               EntryPositions[j], i, false, LockedSymbolSprite);
       saveEntryButton->OnClickHandler = onClick;
       saveEntryButton->AddThumbnail(EmptyThumbnailSprite, ThumbnailRelativePos);
-      MainItems->Add(saveEntryButton);
+      mainItems->Add(saveEntryButton);
       EntryGrid[j] = saveEntryButton;
     }
 
@@ -98,7 +99,7 @@ SaveMenu::SaveMenu() : UI::SaveMenu() {
     EntryGrid[5]->SetFocus(EntryGrid[4], FDIR_UP);
     EntryGrid[5]->SetFocus(EntryGrid[4], FDIR_DOWN);
 
-    QuickSavePages.push_back(MainItems);
+    QuickSavePages.push_back(mainItems);
   }
   // Maintaining focus across pages
   for (auto pageItr = QuickSavePages.begin(); pageItr != QuickSavePages.end();
@@ -129,15 +130,15 @@ SaveMenu::SaveMenu() : UI::SaveMenu() {
   // Full Save Pages initialization
 
   for (int i = 0; i < Pages; i++) {
-    MainItems = new Widgets::Group(this);
-    MainItems->WrapFocus = false;
+    Widgets::Group* mainItems = new Widgets::Group(this);
+    mainItems->WrapFocus = false;
 
     for (int j = 0; j < EntriesPerPage; j++) {
       SaveEntryButton* saveEntryButton = new SaveEntryButton(
           i * EntriesPerPage + j, SaveEntrySprite, EntryHighlightedSprite,
           SaveEntrySprite, EntryPositions[j], i, true, LockedSymbolSprite);
       saveEntryButton->OnClickHandler = onClick;
-      MainItems->Add(saveEntryButton);
+      mainItems->Add(saveEntryButton);
       EntryGrid[j] = saveEntryButton;
     }
 
@@ -156,7 +157,7 @@ SaveMenu::SaveMenu() : UI::SaveMenu() {
     EntryGrid[5]->SetFocus(EntryGrid[4], FDIR_UP);
     EntryGrid[5]->SetFocus(EntryGrid[4], FDIR_DOWN);
 
-    FullSavePages.push_back(MainItems);
+    FullSavePages.push_back(mainItems);
   }
 
   // Maintaining focus across pages
@@ -265,6 +266,10 @@ void SaveMenu::Hide() {
 }
 
 void SaveMenu::UpdateInput(float dt) {
+  if (LockInputs) {
+    return;
+  }
+
   using namespace Vm::Interface;
   Menu::UpdateInput(dt);
   const auto updatePage = [&](int nextPage) {
@@ -336,7 +341,9 @@ void SaveMenu::Update(float dt) {
     TitleFade.Update(dt);
     UpdateTitles();
     if (IsFocused) {
-      SavePages->at(*CurrentPage)->Update(dt);
+      if (!LockInputs) {
+        SavePages->at(*CurrentPage)->Update(dt);
+      }
       SaveEntryButton::UpdateFocusedAlphaFade(dt);
       auto currentlyFocusedButton =
           static_cast<SaveEntryButton*>(CurrentlyFocusedElement);
@@ -541,9 +548,11 @@ void SaveMenu::UpdateTitles() {
 }
 
 void SaveMenu::RefreshCurrentEntryInfo() {
-  if (!CurrentlyFocusedElement) return;
-  static_cast<SaveEntryButton*>(CurrentlyFocusedElement)
-      ->RefreshInfo(EntryType);
+  if (CurrentlyFocusedElement) {
+    static_cast<SaveEntryButton*>(CurrentlyFocusedElement)
+        ->RefreshInfo(EntryType);
+  }
+  LockInputs = false;
 }
 
 }  // namespace CHLCC

src/games/chlcc/savemenu.h

@@ -46,7 +46,6 @@ class SaveMenu : public UI::SaveMenu {
   std::vector<Widgets::Group*> FullSavePages;
   std::vector<Widgets::Group*> QuickSavePages;
   std::vector<Widgets::Group*>* SavePages;
-  Widgets::Group* MainItems;
   Animation MenuTransition;
   Animation TitleFade;
   Animation SelectDataTextFade;
@@ -56,6 +55,10 @@ class SaveMenu : public UI::SaveMenu {
   glm::vec2 RedTitleLabelPos;
   glm::vec2 RightTitlePos;
   glm::vec2 LeftTitlePos;
+  // Prevents race condition where you can squeeze in a click/hover between sys
+  // message and save entry button being refreshed, overriding a button to be
+  // refreshed
+  bool LockInputs = false;
 };
 
 }  // namespace CHLCC