From 5963f0efc3384467688c29436cf7e6384a081931 Mon Sep 17 00:00:00 2001
From: Palapeli <26661008+mkwcat@users.noreply.github.com>
Date: Sun, 5 Apr 2026 13:08:36 -0400
Subject: [PATCH] QR2: Fix nil dereference in previous commit

---
 qr2/session.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/qr2/session.go b/qr2/session.go
index 3b359a7..b14fab3 100644
--- a/qr2/session.go
+++ b/qr2/session.go
@@ -92,7 +92,6 @@ func (session *Session) removeFromGroup() {
 		)
 	} else if session.groupPointer.server == session {
 		logging.Notice("QR2", "Server down in group", aurora.Cyan(session.groupPointer.GroupName))
-		session.groupPointer.server = nil
 		session.groupPointer.findNewServer()
 	}
 
@@ -106,9 +105,6 @@ func (session *Session) removeFromGroup() {
 		}
 	}
 
-	session.groupPointer = nil
-	session.GroupName = ""
-
 	logging.Event(
 		"group_left",
 		map[string]any{
@@ -117,6 +113,10 @@ func (session *Session) removeFromGroup() {
 			"profile_id": session.Data["dwc_pid"],
 		},
 	)
+
+	session.groupPointer = nil
+	session.GroupName = ""
+
 }
 
 // Update session data, creating the session if it doesn't exist. Returns a copy of the session data.