d

Author: FireMario211

about.md

@@ -2,7 +2,7 @@
 **Download, upload, or find custom objects made by other creators!**
 
 This mod was made with most of the hard work done by me! <cp>Firee</c>!
-Thank you to <cj>Midair</c> for the mod idea, <cy>Alphalaneous</c> for the extra mod ui design / feedback, and <cy>Zidnes</c> for creating the ui concept!
+Thank you to <cj>Midair</c> for the mod idea, <cy>Alphalaneous</c> for the extra mod ui design / feedback, and <cy>[Zidnes](https://x.com/SZidnes)</c> for creating the ui concept!
 
 <cy>Additionally, thank you to these people for helping test the mod!</c>
 - TechStudent11

changelog.md

@@ -1,3 +1,7 @@
+# v1.4.4 
+- Fixed issue with opening and closing ProfilePage randomly causing crashes
+- Don't allow opening Object Workshop in ProfilePage while in a level (not sure why you would do that...)
+- Added links to credits for Zidnes
 # v1.4.1
 - Ported to Geode v4.0.0-beta.1 (2.207!)
 - Added DashAuth authentication option

mod.json

@@ -8,7 +8,7 @@
 	},
 	"id": "firee.object-workshop",
 	"name": "Object Workshop",
-	"version": "v1.4.3",
+	"version": "v1.4.4",
 	"developer": "Firee",
 	"description": "Download, upload, or find custom objects made by other creators!",
     "resources": {

src/main.cpp

@@ -269,19 +269,19 @@ class $modify(ObjectBypass, EditorUI) {
 
 #include <Geode/modify/ProfilePage.hpp>
 
-EventListener<web::WebTask> m_profileListener;
-
 class $modify(ProfilePage) {
     struct Fields {
         CCMenuItemSpriteExtra* customObjsBtn;
+        EventListener<web::WebTask> m_profileListener;
     };
     void onClose(CCObject* sender) {
-        m_profileListener.getFilter().cancel();
+        m_fields->m_profileListener.getFilter().cancel();
         ProfilePage::onClose(sender);
     }
     void loadPageFromUserInfo(GJUserScore* user) {
         ProfilePage::loadPageFromUserInfo(user);
-        m_profileListener.bind([this] (web::WebTask::Event* e) {
+        if (GJBaseGameLayer::get()) return;
+        m_fields->m_profileListener.bind([this] (web::WebTask::Event* e) {
             if (web::WebResponse* value = e->getValue()) {
                 log::info("Request was finished!");
                 if (value->json().err() && !value->ok() && value->code() >= 500) {
@@ -394,9 +394,9 @@ class $modify(ProfilePage) {
             auto workshop = typeinfo_cast<ObjectWorkshop*>(scene->getChildByID("objectworkshop"_spr));
             if (workshop != nullptr) return; // so you cant loop lol
             web::WebRequest req = web::WebRequest();
-            m_profileListener.getFilter().cancel();
+            m_fields->m_profileListener.getFilter().cancel();
             req.userAgent(USER_AGENT);
-            m_profileListener.setFilter(req.get(fmt::format("{}/user/{}", HOST_URL, m_accountID)));
+            m_fields->m_profileListener.setFilter(req.get(fmt::format("{}/user/{}", HOST_URL, m_accountID)));
         }
     }
 };