diff --git a/CMakeLists.txt b/CMakeLists.txt index fe4efbb..d3fc64e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,8 @@ if ("${GEODE_TARGET_PLATFORM}" STREQUAL "iOS" OR IOS) set(CMAKE_OSX_ARCHITECTURES "arm64") add_definitions(-DGLES_SILENCE_DEPRECATION) else() - set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64") + #set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64") + set(CMAKE_OSX_ARCHITECTURES "x86_64") endif() set(CMAKE_CXX_VISIBILITY_PRESET hidden) diff --git a/changelog.md b/changelog.md index 6b13400..4c364c9 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,7 @@ +# 1.7.5-beta.2 + +- Fixed crash closing the mod menu + # 1.7.5-beta.1 - Fixed best run not working diff --git a/mod.json b/mod.json index 2b2e6cb..0311b77 100644 --- a/mod.json +++ b/mod.json @@ -1,6 +1,6 @@ { "geode": "4.0.0-alpha.1", - "version": "v1.7.5-beta.1", + "version": "v1.7.5-beta.2", "gd": { "win": "2.2074", "android": "2.2074", diff --git a/src/Client/AndroidUI.cpp b/src/Client/AndroidUI.cpp index ed14704..5335dea 100644 --- a/src/Client/AndroidUI.cpp +++ b/src/Client/AndroidUI.cpp @@ -177,8 +177,8 @@ bool AndroidUI::setup() panel->addChild(versionParent); goToPage(selectedTab); - updateVersionLabel(); updateSearchBox(); + updateVersionLabel(); //if (Client::GetModuleEnabled("npesta-width")) //{ @@ -253,11 +253,13 @@ void AndroidUI::updateVersionLabel() } hasCheckedForUpdates = true; + updateSearchBox(); updateVersionLabel(); } else if (event->isCancelled()) { hasCheckedForUpdates = false; + updateSearchBox(); updateVersionLabel(); } }); @@ -449,17 +451,6 @@ void AndroidUI::goToPage(int p, bool transition) void AndroidUI::onClose(CCObject* sender) { - if (auto pause = CCScene::get()->getChildByType(0)) - { - handleTouchPriority(pause); - } - - CCTouchDispatcher::get()->unregisterForcePrio(this); - CCTouchDispatcher::get()->removeDelegate(this); - - if (CCTouchDispatcher::get()->m_pTargetedHandlers->containsObject(this)) - CCTouchDispatcher::get()->m_pTargetedHandlers->removeObject(this, false); - this->removeFromParent(); } @@ -514,6 +505,7 @@ void AndroidUI::onPressTab(CCObject* sender) void AndroidUI::updateTabs() { int i = 0; + for (auto sprite : sprites) { sprite->updateSelection(i == selectedTab ? CategorySelectionType::Selected : CategorySelectionType::Deselected); @@ -526,7 +518,8 @@ AndroidUI* AndroidUI::create() { auto pRet = new AndroidUI(); - if (pRet->initAnchored(240.f, 160.f)) { + if (pRet->initAnchored(240.f, 160.f)) + { pRet->autorelease(); return pRet; }