fix Signal
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include <td/misc/SlotGuard.h>
|
||||
#include <td/misc/Signal.h>
|
||||
|
||||
namespace td {
|
||||
namespace utils {
|
||||
@@ -12,22 +12,19 @@ namespace utils {
|
||||
*/
|
||||
class SlotGuard {
|
||||
private:
|
||||
std::vector<std::function<void()>> m_Deleters;
|
||||
std::vector<std::unique_ptr<Connection>> m_Connections;
|
||||
|
||||
public:
|
||||
/**
|
||||
* \brief Connect a signal to a function (with the same signature)
|
||||
*/
|
||||
template <typename... Args>
|
||||
void Connect(Signal<Args...>& a_Signal, const typename Signal<Args...>::CallBack& a_Callback) {
|
||||
a_Signal.Connect(a_Callback);
|
||||
m_Deleters.push_back([&a_Signal, &a_Callback]() { a_Signal.Disconnect(a_Callback); });
|
||||
void Connect(Signal<Args...> a_Signal, const typename Signal<Args...>::CallBack& a_Callback) {
|
||||
m_Connections.push_back(a_Signal.ConnectSafe(a_Callback));
|
||||
}
|
||||
|
||||
~SlotGuard() {
|
||||
for (auto& deleter : m_Deleters) {
|
||||
deleter();
|
||||
}
|
||||
void Disconnect() {
|
||||
m_Connections.clear();
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user