fix crashes caused by removing nodes

Cvolton · Jan 19, 2024 · 408d50b · 408d50b
1 parent 573198b
commit 408d50b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/src/hooks/GJScoreCell.cpp b/src/hooks/GJScoreCell.cpp
@@ -22,10 +22,10 @@ class $modify(BIGJScoreCell, GJScoreCell) {
         GJScoreCell::loadFromScore(b);
 
         if(auto player = m_mainLayer->getChildByID("player-icon")) {
+            player->removeFromParent();
+
             auto playerMenu = CCMenu::create();
             playerMenu->setPosition(player->getPosition());
-
-            m_mainLayer->removeChild(player);
             m_mainLayer->addChild(playerMenu);
 
             auto container = CCNode::create();

diff --git a/src/hooks/ProfilePage.cpp b/src/hooks/ProfilePage.cpp
@@ -271,7 +271,7 @@ class $modify(BIProfilePage, ProfilePage) {
         } else {
             if(auto playerStats = m_mainLayer->getChildByID("stats-menu")) {
                 if(auto starsIcon = playerStats->getChildByID("stars-icon")) {
-                    BetterInfo::replaceWithButton(starsIcon, this, menu_selector(BIProfilePage::onProfilePageStar));
+                    m_buttons->addObject(BetterInfo::replaceWithButton(starsIcon, this, menu_selector(BIProfilePage::onProfilePageStar)));
                 }
             }
         }

diff --git a/src/utils.cpp b/src/utils.cpp
@@ -608,7 +608,7 @@ bool BetterInfo::isSprite(CCSprite* sprite, const char* name) {
     return cache->getTexture() == sprite->getTexture() && cache->getRect() == sprite->getTextureRect();
 }
 
-void BetterInfo::replaceWithButton(CCNode* node, CCNode* self, cocos2d::SEL_MenuHandler handler) {
+CCMenuItemSpriteExtra* BetterInfo::replaceWithButton(CCNode* node, CCNode* self, cocos2d::SEL_MenuHandler handler) {
 
     auto parent = node->getParent();
 
@@ -622,6 +622,7 @@ void BetterInfo::replaceWithButton(CCNode* node, CCNode* self, cocos2d::SEL_Menu
     );
     button->setLayoutOptions(node->getLayoutOptions());
     button->setZOrder(node->getZOrder());
+    button->setID(node->getID());
 
     parent->getChildren()->insertObject(button, idx);
     parent->updateLayout();
@@ -632,6 +633,8 @@ void BetterInfo::replaceWithButton(CCNode* node, CCNode* self, cocos2d::SEL_Menu
         button->onEnter();
         button->onEnterTransitionDidFinish();
     }
+
+    return button;
 }
 
 UnlockType BetterInfo::iconTypeToUnlockType(IconType type)

diff --git a/src/utils.hpp b/src/utils.hpp
@@ -59,7 +59,7 @@ namespace BetterInfo {
     bool isHoveringNode(CCNode* target);
 
     bool isSprite(CCSprite* sprite, const char* name);
-    void replaceWithButton(CCNode* node, CCNode* self, cocos2d::SEL_MenuHandler handler);
+    CCMenuItemSpriteExtra* replaceWithButton(CCNode* node, CCNode* self, cocos2d::SEL_MenuHandler handler);
 
     UnlockType iconTypeToUnlockType(IconType type);
 }