Fixed "height > 0" crash in CS (#382)

OpenXRay · Oct 3, 2019 · 2131085 · 2131085
1 parent 37b0ceb
commit 2131085
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/xrUICore/ScrollBar/UIScrollBar.cpp b/src/xrUICore/ScrollBar/UIScrollBar.cpp
@@ -42,9 +42,14 @@ bool CUIScrollBar::InitScrollBar(Fvector2 pos, float length, bool bIsHorizontal,
     xml_doc.Load(CONFIG_PATH, UI_PATH, UI_PATH_DEFAULT, "scroll_bar.xml");
 
     float height = xml_doc.ReadAttribFlt(profile, 0, (bIsHorizontal) ? "height" : "height_v");
-    if (height == 0.0f && ShadowOfChernobylMode)
-        height = xml_doc.ReadAttribFlt(profile, 0, "height");
-    R_ASSERT(height > 0);
+    if (height == 0.0f)
+    {
+        if (ShadowOfChernobylMode)
+            height = xml_doc.ReadAttribFlt(profile, 0, "height");
+        else if (ClearSkyMode)
+            height = 16;
+    }
+    R_ASSERT(height > 0.0f);
     m_hold_delay = xml_doc.ReadAttribFlt(profile, 0, "hold_delay", 50.0f);
 
     inherited::SetWndPos(pos);