hyprwm
/
Hyprland
mirror of https://github.com/hyprwm/Hyprland
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix lastwindow in focusWindow null

This commit is contained in:
Vaxry 2022-08-08 20:42:14 +02:00
parent 87a2ecb90e
commit 9fca4b5bc2
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Compositor.cpp
View File

@ -615,16 +615,18 @@ void CCompositor::focusWindow(CWindow* pWindow, wlr_surface* pSurface) {
} }
if (!pWindow || !windowValidMapped(pWindow)) { if (!pWindow || !windowValidMapped(pWindow)) {
if (windowValidMapped(m_pLastWindow)) { const auto PLASTWINDOW = m_pLastWindow;
updateWindowAnimatedDecorationValues(m_pLastWindow); m_pLastWindow = nullptr;
if (m_pLastWindow->m_phForeignToplevel) if (windowValidMapped(PLASTWINDOW)) {
wlr_foreign_toplevel_handle_v1_set_activated(m_pLastWindow->m_phForeignToplevel, false); updateWindowAnimatedDecorationValues(PLASTWINDOW);
if (PLASTWINDOW->m_phForeignToplevel)
wlr_foreign_toplevel_handle_v1_set_activated(PLASTWINDOW->m_phForeignToplevel, false);
} }
wlr_seat_keyboard_notify_clear_focus(m_sSeat.seat); wlr_seat_keyboard_notify_clear_focus(m_sSeat.seat);
m_pLastWindow = nullptr;
m_pLastFocus = nullptr; m_pLastFocus = nullptr;
return; return;
} }