remove repeated check

hyprwm · Sep 26, 2024 · 31af287 · 31af287
1 parent 1ad7481
commit 31af287
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/layout/DwindleLayout.cpp b/src/layout/DwindleLayout.cpp
@@ -327,9 +327,8 @@ void CHyprDwindleLayout::onWindowCreatedTiling(PHLWINDOW pWindow, eDirection dir
     static auto AUTOGROUP = CConfigValue<Hyprlang::INT>("group:auto_group");
     // Auto group the new tiling window if the focused window is a open group
     if ((*AUTOGROUP || g_pInputManager->m_bWasDraggingWindow) && g_pCompositor->m_pLastWindow.lock() && g_pCompositor->m_pLastWindow->m_pWorkspace == pWindow->m_pWorkspace &&
-        getNodeFromWindow(g_pCompositor->m_pLastWindow.lock()) != PNODE && g_pCompositor->m_pLastWindow &&
-        g_pCompositor->m_pLastWindow->m_sGroupData.pNextWindow                                         // target: active group
-        && pWindow->canBeGroupedInto(g_pCompositor->m_pLastWindow.lock()) && !m_vOverrideFocalPoint) { // we are not moving window
+        getNodeFromWindow(g_pCompositor->m_pLastWindow.lock()) != PNODE && g_pCompositor->m_pLastWindow->m_sGroupData.pNextWindow // target: active group
+        && pWindow->canBeGroupedInto(g_pCompositor->m_pLastWindow.lock()) && !m_vOverrideFocalPoint) {                            // we are not moving window
 
         m_lDwindleNodesData.remove(*PNODE);
 

diff --git a/src/layout/IHyprLayout.cpp b/src/layout/IHyprLayout.cpp
@@ -84,7 +84,7 @@ void IHyprLayout::onWindowCreatedFloating(PHLWINDOW pWindow) {
     // Auto group the new floating window if the focused window is a open group
     static auto AUTOGROUP = CConfigValue<Hyprlang::INT>("group:auto_group");
     if ((*AUTOGROUP || g_pInputManager->m_bWasDraggingWindow) && g_pCompositor->m_pLastWindow.lock() && g_pCompositor->m_pLastWindow->m_pWorkspace == pWindow->m_pWorkspace &&
-        g_pCompositor->m_pLastWindow && g_pCompositor->m_pLastWindow->m_sGroupData.pNextWindow // target: active group
+        g_pCompositor->m_pLastWindow->m_sGroupData.pNextWindow // target: active group
         && pWindow->canBeGroupedInto(g_pCompositor->m_pLastWindow.lock())) {
 
         if (!g_pCompositor->m_pLastWindow->m_bIsFloating) { // target: focused tiled group

diff --git a/src/layout/MasterLayout.cpp b/src/layout/MasterLayout.cpp
@@ -119,8 +119,7 @@ void CHyprMasterLayout::onWindowCreatedTiling(PHLWINDOW pWindow, eDirection dire
     static auto AUTOGROUP = CConfigValue<Hyprlang::INT>("group:auto_group");
     // Auto group the new tiling window if the focused window is a open group
     if ((*AUTOGROUP || g_pInputManager->m_bWasDraggingWindow) && g_pCompositor->m_pLastWindow.lock() && g_pCompositor->m_pLastWindow->m_pWorkspace == pWindow->m_pWorkspace &&
-        getNodeFromWindow(g_pCompositor->m_pLastWindow.lock()) != PNODE && g_pCompositor->m_pLastWindow &&
-        g_pCompositor->m_pLastWindow->m_sGroupData.pNextWindow // target: active group
+        getNodeFromWindow(g_pCompositor->m_pLastWindow.lock()) != PNODE && g_pCompositor->m_pLastWindow->m_sGroupData.pNextWindow // target: active group
         && pWindow->canBeGroupedInto(g_pCompositor->m_pLastWindow.lock())) {
 
         m_lMasterNodesData.remove(*PNODE);