From 7a468f62730029be9a47a2079fa267788d7a339e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 2 Jul 2021 23:39:18 +0300
Subject: SL-15528 Crash at reblendSettings

looks like blenders weren't inited yet.
---
 indra/newview/llfloatereditextdaycycle.cpp | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'indra/newview/llfloatereditextdaycycle.cpp')

diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp
index 0501c287ad..281d4f68f5 100644
--- a/indra/newview/llfloatereditextdaycycle.cpp
+++ b/indra/newview/llfloatereditextdaycycle.cpp
@@ -1457,14 +1457,22 @@ void LLFloaterEditExtDayCycle::reblendSettings()
 {
     F64 position = mTimeSlider->getCurSliderValue();
 
-    if ((mSkyBlender->getTrack() != mCurrentTrack) && (mCurrentTrack != LLSettingsDay::TRACK_WATER))
+    if (mSkyBlender)
     {
-        mSkyBlender->switchTrack(mCurrentTrack, position);
+        if ((mSkyBlender->getTrack() != mCurrentTrack) && (mCurrentTrack != LLSettingsDay::TRACK_WATER))
+        {
+            mSkyBlender->switchTrack(mCurrentTrack, position);
+        }
+        else
+        {
+            mSkyBlender->setPosition(position);
+        }
     }
-    else
-        mSkyBlender->setPosition(position);
 
-    mWaterBlender->setPosition(position);    
+    if (mWaterBlender)
+    {
+        mWaterBlender->setPosition(position);
+    }
 }
 
 void LLFloaterEditExtDayCycle::doApplyCommit(LLSettingsDay::ptr_t day)
-- 
cgit v1.2.3