mirror of
https://github.com/hyprwm/Hyprland.git
synced 2025-08-28 18:33:48 -07:00
* Add temporary fix for #2808 by adding nullptr check. * Remove redundency.
This commit is contained in:
@@ -77,7 +77,7 @@ void CXDGOutputProtocol::onManagerGetXDGOutput(wl_client* client, wl_resource* r
|
|||||||
|
|
||||||
SXDGOutput* pXDGOutput = m_vXDGOutputs.emplace_back(std::make_unique<SXDGOutput>(PMONITOR)).get();
|
SXDGOutput* pXDGOutput = m_vXDGOutputs.emplace_back(std::make_unique<SXDGOutput>(PMONITOR)).get();
|
||||||
#ifndef NO_XWAYLAND
|
#ifndef NO_XWAYLAND
|
||||||
if (g_pXWaylandManager->m_sWLRXWayland->server->client == client)
|
if (g_pXWaylandManager->m_sWLRXWayland && g_pXWaylandManager->m_sWLRXWayland->server && g_pXWaylandManager->m_sWLRXWayland->server->client == client)
|
||||||
pXDGOutput->isXWayland = true;
|
pXDGOutput->isXWayland = true;
|
||||||
#endif
|
#endif
|
||||||
pXDGOutput->client = client;
|
pXDGOutput->client = client;
|
||||||
@@ -124,4 +124,4 @@ void CXDGOutputProtocol::updateAllOutputs() {
|
|||||||
|
|
||||||
wlr_output_schedule_done(o->monitor->output);
|
wlr_output_schedule_done(o->monitor->output);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user