From c4d0e88e6e2678e240c8d524dcecb64bdc49d8e5 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Wed, 14 Feb 2024 17:41:17 -0500 Subject: [PATCH] Fix: Asset browser crash after recent cleanup After 57586df68791520fa857. Turns out the library can be null here. --- .../editors/space_file/asset_catalog_tree_view.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/source/blender/editors/space_file/asset_catalog_tree_view.cc b/source/blender/editors/space_file/asset_catalog_tree_view.cc index da677751283..fb3a4b371ef 100644 --- a/source/blender/editors/space_file/asset_catalog_tree_view.cc +++ b/source/blender/editors/space_file/asset_catalog_tree_view.cc @@ -181,11 +181,14 @@ class AssetCatalogTreeViewUnassignedItem : public ui::BasicTreeViewItem { AssetCatalogTreeView::AssetCatalogTreeView(asset_system::AssetLibrary *library, FileAssetSelectParams *params, SpaceFile &space_file) - : asset_library_(library), - catalog_tree_(library->catalog_service->get_catalog_tree()), - params_(params), - space_file_(space_file) + : asset_library_(library), params_(params), space_file_(space_file) { + if (library && library->catalog_service) { + catalog_tree_ = library->catalog_service->get_catalog_tree(); + } + else { + catalog_tree_ = nullptr; + } } void AssetCatalogTreeView::build_tree()