7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-27 01:45:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix event listeners vector containing freed listeners

Browse source
This commit is contained in:
HJfod 2023-04-03 21:04:56 +03:00
parent 4801f6725f
commit c1d4a89f8b
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
loader/src/loader/Event.cpp
View file

@ -4,7 +4,9 @@
using namespace geode::prelude;
void EventListenerProtocol::enable() {
Event::listeners().push_back(this);
if (!ranges::contains(Event::listeners(), this)) {
Event::listeners().push_back(this);
}
}
void EventListenerProtocol::disable() {
@ -20,7 +22,16 @@ Event::~Event() {}
void Event::postFrom(Mod* m) {
if (m) this->sender = m;
auto& listeners = Event::listeners();
listeners.erase(std::remove_if(
listeners.begin(),
listeners.end(),
[](auto& a) {
return Event::removedListeners().contains(a);
}
), listeners.end());
Event::removedListeners().clear();
std::vector<EventListenerProtocol*> listeners_copy = Event::listeners();
for (auto h : listeners_copy) {
// if an event listener gets destroyed in the middle of this loop, we
@ -30,7 +41,6 @@ void Event::postFrom(Mod* m) {
break;
}
}
Event::removedListeners().clear();
}
std::unordered_set<EventListenerProtocol*>& Event::removedListeners() {

8
loader/src/utils/cocos.cpp
View file

@ -328,8 +328,12 @@ void geode::cocos::limitNodeSize(cocos2d::CCNode* spr, cocos2d::CCSize const& si
}
bool geode::cocos::nodeIsVisible(cocos2d::CCNode* node) {
if (!node->isVisible()) return false;
if (node->getParent()) return nodeIsVisible(node->getParent());
if (!node->isVisible()) {
return false;
}
if (node->getParent()) {
return nodeIsVisible(node->getParent());
}
return true;
}