#6107: Fix a crash when switching maps

codereader · Oct 2, 2022 · 00e53b9 · 00e53b9
1 parent 0544faf
commit 00e53b9
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/radiant/ui/layers/LayerControlDialog.cpp b/radiant/ui/layers/LayerControlDialog.cpp
@@ -283,10 +283,7 @@ void LayerControlDialog::update()
 {
     _updateTreeOnIdle = false;
 
-	if (!GlobalMapModule().getRoot())
-	{
-		return;
-	}
+    if (!GlobalMapModule().getRoot()) return;
 
 	auto& layerManager = GlobalMapModule().getRoot()->getLayerManager();
     auto activeLayerId = layerManager.getActiveLayer();
@@ -347,7 +344,9 @@ void LayerControlDialog::updateLayerUsage()
 {
 	_rescanSelectionOnIdle = false;
 
-	// Scan the selection and get the histogram
+    if (!GlobalMapModule().getRoot()) return;
+
+    // Scan the selection and get the histogram
 	auto breakDown = scene::LayerUsageBreakdown::CreateFromSelection();
 
     GlobalMapModule().getRoot()->getLayerManager().foreachLayer([&](int layerId, const std::string& layerName)