From f9d8b3096aa4b1829e49817356f1ac870c12a9ee Mon Sep 17 00:00:00 2001 From: Dickby Date: Fri, 23 Sep 2022 17:01:46 +0200 Subject: [PATCH 1/3] fix crash Fixes #711 --- src/layout/DwindleLayout.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/layout/DwindleLayout.cpp b/src/layout/DwindleLayout.cpp index 19716ede..d3b051df 100644 --- a/src/layout/DwindleLayout.cpp +++ b/src/layout/DwindleLayout.cpp @@ -818,9 +818,18 @@ void CHyprDwindleLayout::toggleWindowGroup(CWindow* pWindow) { PWINDOW->m_bHidden = false; } + + if(PHEAD->pPreviousGroupMember) + { + PHEAD->pPreviousGroupMember->pNextGroupMember = PHEAD->pNextGroupMember; + PHEAD->pPreviousGroupMember = nullptr; + } + if(PHEAD->pNextGroupMember) + { + PHEAD->pNextGroupMember->pPreviousGroupMember = PHEAD->pPreviousGroupMember; + PHEAD->pNextGroupMember = nullptr; + } - PHEAD->pPreviousGroupMember = nullptr; - PHEAD->pNextGroupMember = nullptr; onWindowRemoved(PHEAD->pWindow); for (auto& pw : toAddWindows) { From 00b16888bf8db82b39b1747530fcc679af53ec0d Mon Sep 17 00:00:00 2001 From: Dickby Date: Fri, 23 Sep 2022 17:59:33 +0200 Subject: [PATCH 2/3] style fix --- src/layout/DwindleLayout.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/layout/DwindleLayout.cpp b/src/layout/DwindleLayout.cpp index d3b051df..31558cd5 100644 --- a/src/layout/DwindleLayout.cpp +++ b/src/layout/DwindleLayout.cpp @@ -819,15 +819,13 @@ void CHyprDwindleLayout::toggleWindowGroup(CWindow* pWindow) { PWINDOW->m_bHidden = false; } - if(PHEAD->pPreviousGroupMember) - { - PHEAD->pPreviousGroupMember->pNextGroupMember = PHEAD->pNextGroupMember; - PHEAD->pPreviousGroupMember = nullptr; + if(PHEAD->pPreviousGroupMember){ + PHEAD->pPreviousGroupMember->pNextGroupMember = PHEAD->pNextGroupMember; + PHEAD->pPreviousGroupMember = nullptr; } - if(PHEAD->pNextGroupMember) - { - PHEAD->pNextGroupMember->pPreviousGroupMember = PHEAD->pPreviousGroupMember; - PHEAD->pNextGroupMember = nullptr; + if(PHEAD->pNextGroupMember){ + PHEAD->pNextGroupMember->pPreviousGroupMember = PHEAD->pPreviousGroupMember; + PHEAD->pNextGroupMember = nullptr; } onWindowRemoved(PHEAD->pWindow); From fd6116c0cd2341a75b06a21f7273d44e69153700 Mon Sep 17 00:00:00 2001 From: vaxerski Date: Fri, 23 Sep 2022 17:01:27 +0100 Subject: [PATCH 3/3] style --- src/layout/DwindleLayout.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/layout/DwindleLayout.cpp b/src/layout/DwindleLayout.cpp index 31558cd5..fbd8acd4 100644 --- a/src/layout/DwindleLayout.cpp +++ b/src/layout/DwindleLayout.cpp @@ -819,11 +819,12 @@ void CHyprDwindleLayout::toggleWindowGroup(CWindow* pWindow) { PWINDOW->m_bHidden = false; } - if(PHEAD->pPreviousGroupMember){ + if (PHEAD->pPreviousGroupMember) { PHEAD->pPreviousGroupMember->pNextGroupMember = PHEAD->pNextGroupMember; PHEAD->pPreviousGroupMember = nullptr; } - if(PHEAD->pNextGroupMember){ + + if (PHEAD->pNextGroupMember) { PHEAD->pNextGroupMember->pPreviousGroupMember = PHEAD->pPreviousGroupMember; PHEAD->pNextGroupMember = nullptr; }