3party/EventBus
1
0
Fork 0
mirror of https://github.com/gelldur/EventBus.git synced 2025-01-14 17:30:08 +08:00
Code Issues Projects Releases Wiki Activity

Fix bug with removing listeners

Browse Source
This commit is contained in:
Dawid Drozd 2016-09-22 13:54:25 +02:00
parent d6a0b8c8e5
commit e23c3b2850
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Notifier.h
View File

@ -5,6 +5,7 @@
#include <vector> #include <vector>
#include <functional> #include <functional>
#include <map> #include <map>
#include <algorithm>
namespace Dexode namespace Dexode
{ {
@ -24,8 +25,10 @@ public:
{ {
for (auto&& it = _callbacks.begin(); it != _callbacks.end(); ++it) for (auto&& it = _callbacks.begin(); it != _callbacks.end(); ++it)
{ {
assert(it->second);
delete it->second; delete it->second;
} }
_callbacks.clear();
} }
Notifier& operator=(const Notifier&) = delete; Notifier& operator=(const Notifier&) = delete;
@ -153,6 +156,7 @@ private:
virtual ~VectorImpl() virtual ~VectorImpl()
{ {
removeAll();
} }
virtual void removeAll() override virtual void removeAll() override
@ -162,14 +166,16 @@ private:
virtual void remove(const int token) override virtual void remove(const int token) override
{ {
for (int i = container.size() - 1; i > -1; --i) auto removeFrom = std::remove_if(container.begin(), container.end()
, [token](const std::pair<Type, int>& element)
{
return element.second == token;
});
if (removeFrom == container.end())
{ {
if (container[i].second == token) return;
{
std::swap(container[i], container.back());
container.pop_back();
}
} }
container.erase(removeFrom, container.end());
} }
}; };