keybinds: fix unguarded member access in moveWindowOrGroup (#13337)
This commit is contained in:
parent
b88813c7ef
commit
f4bc8c3a64
1 changed files with 2 additions and 1 deletions
|
|
@ -2834,12 +2834,13 @@ SDispatchResult CKeybindManager::moveWindowOrGroup(std::string args) {
|
||||||
const bool ISWINDOWGROUP = PWINDOW->m_group;
|
const bool ISWINDOWGROUP = PWINDOW->m_group;
|
||||||
const bool ISWINDOWGROUPLOCKED = ISWINDOWGROUP && PWINDOW->m_group->locked();
|
const bool ISWINDOWGROUPLOCKED = ISWINDOWGROUP && PWINDOW->m_group->locked();
|
||||||
const bool ISWINDOWGROUPSINGLE = ISWINDOWGROUP && PWINDOW->m_group->size() == 1;
|
const bool ISWINDOWGROUPSINGLE = ISWINDOWGROUP && PWINDOW->m_group->size() == 1;
|
||||||
|
const bool ISWINDOWGROUPDENIED = ISWINDOWGROUP && PWINDOW->m_group->denied();
|
||||||
|
|
||||||
updateRelativeCursorCoords();
|
updateRelativeCursorCoords();
|
||||||
|
|
||||||
// note: PWINDOWINDIR is not null implies !PWINDOW->m_isFloating
|
// note: PWINDOWINDIR is not null implies !PWINDOW->m_isFloating
|
||||||
if (PWINDOWINDIR && PWINDOWINDIR->m_group) { // target is group
|
if (PWINDOWINDIR && PWINDOWINDIR->m_group) { // target is group
|
||||||
if (!*PIGNOREGROUPLOCK && (PWINDOWINDIR->m_group->locked() || ISWINDOWGROUPLOCKED || PWINDOW->m_group->denied())) {
|
if (!*PIGNOREGROUPLOCK && (PWINDOWINDIR->m_group->locked() || ISWINDOWGROUPLOCKED || ISWINDOWGROUPDENIED)) {
|
||||||
g_layoutManager->moveInDirection(PWINDOW->layoutTarget(), args);
|
g_layoutManager->moveInDirection(PWINDOW->layoutTarget(), args);
|
||||||
PWINDOW->warpCursor();
|
PWINDOW->warpCursor();
|
||||||
} else
|
} else
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue