hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-30 00:25:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

output: avoid crashes when binding a defunct wl_output global

Browse source 
ref #6508
This commit is contained in:
Vaxry 2024-06-15 17:56:44 +02:00
parent 6c24dc0bb1
commit 77f44bfcab
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/protocols/core/Output.cpp
View file

@ -9,6 +9,9 @@ CWLOutputResource::CWLOutputResource(SP<CWlOutput> resource_, SP<CMonitor> pMoni
pClient = resource->client(); pClient = resource->client();
if (!monitor)
return;
resource->setOnDestroy([this](CWlOutput* r) { resource->setOnDestroy([this](CWlOutput* r) {
if (monitor && PROTO::outputs.contains(monitor->szName)) if (monitor && PROTO::outputs.contains(monitor->szName))
PROTO::outputs.at(monitor->szName)->destroyResource(this); PROTO::outputs.at(monitor->szName)->destroyResource(this);
@ -69,6 +72,9 @@ CWLOutputProtocol::CWLOutputProtocol(const wl_interface* iface, const int& ver,
} }
void CWLOutputProtocol::bindManager(wl_client* client, void* data, uint32_t ver, uint32_t id) { void CWLOutputProtocol::bindManager(wl_client* client, void* data, uint32_t ver, uint32_t id) {
if (defunct)
Debug::log(WARN, "[wl_output] Binding a wl_output that's inert?? Possible client bug.");
const auto RESOURCE = m_vOutputs.emplace_back(makeShared<CWLOutputResource>(makeShared<CWlOutput>(client, ver, id), monitor.lock())); const auto RESOURCE = m_vOutputs.emplace_back(makeShared<CWLOutputResource>(makeShared<CWlOutput>(client, ver, id), monitor.lock()));
if (!RESOURCE->good()) { if (!RESOURCE->good()) {