Do not crash when a monitor is removed

This commit is contained in:
Jef Steelant
2022-11-09 09:34:19 +01:00
parent 8be5bab8ad
commit 8f4f67f69f
6 changed files with 62 additions and 16 deletions

View File

@ -95,15 +95,37 @@ void IPC::parseIPC(const std::string& ev) {
for (auto& [eventname, handler] : callbacks) {
if (eventname == request) {
handler(ev);
handler->onEvent(ev);
}
}
}
void IPC::registerForIPC(const std::string& ev, std::function<void(const std::string&)> fn) {
void IPC::registerForIPC(const std::string& ev, EventHandler* ev_handler) {
if (!ev_handler) {
return;
}
callbackMutex.lock();
callbacks.emplace_back(std::make_pair(ev, fn));
callbacks.emplace_back(std::make_pair(ev, ev_handler));
callbackMutex.unlock();
}
void IPC::unregisterForIPC(EventHandler* ev_handler) {
if (!ev_handler) {
return;
}
callbackMutex.lock();
for(auto it = callbacks.begin(); it != callbacks.end(); ) {
auto it_current = it;
it++;
auto& [eventname, handler] = *it_current;
if (handler == ev_handler) {
callbacks.erase(it_current);
}
}
callbackMutex.unlock();
}
@ -168,4 +190,4 @@ std::string IPC::getSocket1Reply(const std::string& rq) {
return std::string(buffer);
}
} // namespace waybar::modules::hyprland
} // namespace waybar::modules::hyprland