Bug fix, late modify

Author: Alphalaneous

changelog.md

@@ -1,3 +1,7 @@
+## 2.0.1
+- Fix a crash when a texture name was too short
+- Update UI at end of frame rather than start
+
 ## 2.0.0
 **NOTICE! Modifying nodes by ID is removed. You must now modify them by their class name instead.**
 - Code cleanup

mod.json

@@ -6,7 +6,7 @@
         "mac": "2.2074",
         "ios": "2.2074"
     },
-    "version": "v2.0.0",
+    "version": "v2.0.1",
     "id": "alphalaneous.happy_textures",
     "name": "Happy Textures :3",
     "developer": "Alphalaneous",

src/NodeModding.hpp

@@ -2,26 +2,71 @@
 
 #include <Geode/Geode.hpp>
 #include <Geode/modify/CCObject.hpp>
+#include <Geode/modify/CCPoolManager.hpp>
 #include "UIModding.hpp"
 #include "nodes/CCNode.hpp"
 #include "Utils.hpp"
 #include "Macros.hpp"
 
 using namespace geode::prelude;
 
+class LateQueue {
+protected:
+    static LateQueue* instance;
+public:
+    std::vector<std::function<void(void)>> m_mainThreadQueue;
+    mutable std::mutex m_mainThreadMutex;
+
+    void queue(ScheduledFunction&& func) {
+        std::lock_guard<std::mutex> lock(m_mainThreadMutex);
+        m_mainThreadQueue.push_back(std::forward<ScheduledFunction>(func));
+    }
+
+    void executeQueue() {
+        m_mainThreadMutex.lock();
+        auto queue = m_mainThreadQueue;
+        m_mainThreadQueue.clear();
+        m_mainThreadMutex.unlock();
+
+        for (auto const& func : queue) {
+            func();
+        }
+    }
+
+    static LateQueue* get() {
+        if (!instance) {
+            instance = new LateQueue();
+        };
+        return instance;
+    }
+};
+LateQueue* LateQueue::instance = nullptr;
+
 class $modify(CCObject) {
 
     CCObject* autorelease() {
         auto modding = UIModding::get();
-        if (modding->doModify) {
-            if (MyCCNode* node = static_cast<MyCCNode*>(typeinfo_cast<CCNode*>(this))) {
+        if (!modding->doModify) return CCObject::autorelease();
+        
+        if (MyCCNode* node = static_cast<MyCCNode*>(typeinfo_cast<CCNode*>(this))) {
+            if (modding->finishedLoad && !node->isModified()) {
                 const std::string& className = Utils::getNodeName(node);
-                if (modding->finishedLoad && !node->isModified()) {
+                node->retain();
+                LateQueue::get()->queue([modding, node, className] {
                     modding->doUICheckForType(className, node);
                     node->setModified();
-                }
+                    node->release();
+                });
             }
         }
+        
         return CCObject::autorelease();
     }
 };
+
+class $modify(CCPoolManager) {
+    void pop() {
+        LateQueue::get()->executeQueue();
+        CCPoolManager::pop();
+    }
+};

src/Utils.hpp

@@ -174,15 +174,14 @@ namespace Utils {
 
         size_t prefixEnd = dotPos;
 
-        if (str.compare(prefixEnd - 4, 4, "-uhd") == 0) {
+        if (prefixEnd >= 4 && str.compare(prefixEnd - 4, 4, "-uhd") == 0) {
             prefixEnd -= 4;
-        } else if (str.compare(prefixEnd - 3, 3, "-hd") == 0) {
+        } else if (prefixEnd >= 3 && str.compare(prefixEnd - 3, 3, "-hd") == 0) {
             prefixEnd -= 3;
         }
 
         if (prefixEnd < dotPos) {
             str.erase(prefixEnd, dotPos - prefixEnd);
-            dotPos = prefixEnd;
         }
     }