Save Entries Refresh Info Fix

- Remember the button that was actually clicked

Author: Gunoshozo

src/games/cclcc/savemenu.cpp

@@ -7,7 +7,6 @@
 #include "../../inputsystem.h"
 #include "../../vm/interface/input.h"
 #include "../../ui/widgets/button.h"
-#include "../../ui/widgets/cclcc/saveentrybutton.h"
 #include "../../data/savesystem.h"
 #include "../../profile/game.h"
 #include "../../games/cclcc/savesystem.h"
@@ -35,7 +34,7 @@ void SaveMenu::MenuButtonOnClick(Widgets::Button* target) {
     ScrWork[SW_SAVEFILETYPE] = (int)saveType;
     ScrWork[SW_SAVEFILESTATUS] =
         SaveSystem::GetSaveStatus(saveType, ScrWork[SW_SAVEFILENO]);
-
+    ClickedSaveButton = static_cast<SaveEntryButton*>(target);
     ChoiceMade = true;
     SetFlag(SF_SAVEPROTECTED,
             SaveSystem::GetSaveFlags(saveType, ScrWork[SW_SAVEFILENO]) &
@@ -384,8 +383,8 @@ void SaveMenu::Render() {
 }
 
 void SaveMenu::RefreshCurrentEntryInfo() {
-  if (!CurrentlyFocusedElement) return;
-  static_cast<SaveEntryButton*>(CurrentlyFocusedElement)->RefreshInfo();
+  if (!ClickedSaveButton) return;
+  ClickedSaveButton->RefreshInfo();
 }
 
 }  // namespace CCLCC

src/games/cclcc/savemenu.h

@@ -5,10 +5,12 @@
 #include "../../ui/widgets/button.h"
 #include "../../ui/savemenu.h"
 #include "../../profile/games/cclcc/savemenu.h"
+#include "../../ui/widgets/cclcc/saveentrybutton.h"
 
 namespace Impacto {
 namespace UI {
 namespace CCLCC {
+using namespace Impacto::UI::Widgets::CCLCC;
 
 class SaveMenu : public UI::SaveMenu {
  public:
@@ -28,6 +30,7 @@ class SaveMenu : public UI::SaveMenu {
   int PrevPage = 0;
   int CurrentPage = 0;
   Widgets::Group* MainItems[Profile::CCLCC::SaveMenu::Pages]{};
+  SaveEntryButton* ClickedSaveButton = 0;
   Animation FadeAnimation;
   Animation PageAnimation;
   bool HasCleared = true;

src/games/chlcc/savemenu.cpp

@@ -37,6 +37,7 @@ void SaveMenu::MenuButtonOnClick(Widgets::Button* target) {
     SetFlag(SF_SAVEPROTECTED,
             SaveSystem::GetSaveFlags(EntryType, ScrWork[SW_SAVEFILENO]) &
                 SaveSystem::SaveFlagsMode::WriteProtect);
+    ClickedSaveButton = static_cast<SaveEntryButton*>(target);
     ChoiceMade = true;
   }
 }
@@ -69,7 +70,7 @@ SaveMenu::SaveMenu() : UI::SaveMenu() {
   // Quick Save Pages initialization
 
   for (int i = 0; i < Pages; i++) {
-    MainItems = new Widgets::Group(this);
+    Widgets::Group* MainItems = new Widgets::Group(this);
     MainItems->WrapFocus = false;
 
     for (int j = 0; j < EntriesPerPage; j++) {
@@ -129,7 +130,7 @@ SaveMenu::SaveMenu() : UI::SaveMenu() {
   // Full Save Pages initialization
 
   for (int i = 0; i < Pages; i++) {
-    MainItems = new Widgets::Group(this);
+    Widgets::Group* MainItems = new Widgets::Group(this);
     MainItems->WrapFocus = false;
 
     for (int j = 0; j < EntriesPerPage; j++) {
@@ -541,9 +542,8 @@ void SaveMenu::UpdateTitles() {
 }
 
 void SaveMenu::RefreshCurrentEntryInfo() {
-  if (!CurrentlyFocusedElement) return;
-  static_cast<SaveEntryButton*>(CurrentlyFocusedElement)
-      ->RefreshInfo(EntryType);
+  if (!ClickedSaveButton) return;
+  ClickedSaveButton->RefreshInfo(EntryType);
 }
 
 }  // namespace CHLCC

src/games/chlcc/savemenu.h

@@ -46,7 +46,7 @@ class SaveMenu : public UI::SaveMenu {
   std::vector<Widgets::Group*> FullSavePages;
   std::vector<Widgets::Group*> QuickSavePages;
   std::vector<Widgets::Group*>* SavePages;
-  Widgets::Group* MainItems;
+  SaveEntryButton* ClickedSaveButton = 0;
   Animation MenuTransition;
   Animation TitleFade;
   Animation SelectDataTextFade;