From 4cab6e2ba86626e6e0680f75f88ecfbd16bbbd40 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 2 Jan 2024 01:12:13 -0500
Subject: [PATCH] Fix more ao crash

---
 indra/newview/aoengine.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/indra/newview/aoengine.cpp b/indra/newview/aoengine.cpp
index d6d7cb88ae7..e29c581308f 100644
--- a/indra/newview/aoengine.cpp
+++ b/indra/newview/aoengine.cpp
@@ -1469,7 +1469,10 @@ void AOEngine::update()
 				{
 					mDefaultSet = newSet;
 					mCurrentSet = newSet;
-					mSetChangedSignal(mCurrentSet->getName());
+					if (mCurrentSet)
+					{
+						mSetChangedSignal(mCurrentSet->getName());
+					}
 				}
 				else
 				{
@@ -1633,7 +1636,10 @@ void AOEngine::selectSet(AOSet* set)
 	}
 
 	mCurrentSet = set;
-	mSetChangedSignal(mCurrentSet->getName());
+	if (mCurrentSet)
+	{
+		mSetChangedSignal(mCurrentSet->getName());
+	}
 
 	if (mEnabled)
 	{
-- 
GitLab