From b341fe60a75eae94a2ee612387dafd280ed62208 Mon Sep 17 00:00:00 2001
From: outfoxxed <outfoxxed@outfoxxed.me>
Date: Sun, 10 Dec 2023 01:02:23 -0800
Subject: [PATCH] Fix crash when moving focus of a node containing multiple
 windows

---
 src/Hy3Layout.cpp | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/Hy3Layout.cpp b/src/Hy3Layout.cpp
index 7182bd8..9cd184e 100644
--- a/src/Hy3Layout.cpp
+++ b/src/Hy3Layout.cpp
@@ -938,20 +938,23 @@ void Hy3Layout::shiftWindow(int workspace, ShiftDirection direction, bool once,
 
 void Hy3Layout::shiftFocus(int workspace, ShiftDirection direction, bool visible) {
 	auto* current_window = g_pCompositor->m_pLastWindow;
-	auto* p_workspace = g_pCompositor->getWorkspaceByID(current_window->m_iWorkspaceID);
-	if (p_workspace->m_bHasFullscreenWindow) return;
 
-	if (current_window != nullptr && current_window->m_bIsFloating) {
-		auto* next_window = g_pCompositor->getWindowInDirection(
-		    current_window,
-		    direction == ShiftDirection::Left   ? 'l'
-		    : direction == ShiftDirection::Up   ? 'u'
-		    : direction == ShiftDirection::Down ? 'd'
-		                                        : 'r'
-		);
+	if (current_window != nullptr) {
+		auto* p_workspace = g_pCompositor->getWorkspaceByID(current_window->m_iWorkspaceID);
+		if (p_workspace->m_bHasFullscreenWindow) return;
 
-		if (next_window != nullptr) g_pCompositor->focusWindow(next_window);
-		return;
+		if (current_window->m_bIsFloating) {
+			auto* next_window = g_pCompositor->getWindowInDirection(
+			    current_window,
+			    direction == ShiftDirection::Left   ? 'l'
+			    : direction == ShiftDirection::Up   ? 'u'
+			    : direction == ShiftDirection::Down ? 'd'
+			                                        : 'r'
+			);
+
+			if (next_window != nullptr) g_pCompositor->focusWindow(next_window);
+			return;
+		}
 	}
 
 	auto* node = this->getWorkspaceFocusedNode(workspace);