Fix issue with removed to the recycle bin locations models as well

story-apps · Nov 30, 2022 · 087fc10 · 087fc10
1 parent 84ccccb
commit 087fc10
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/core/management_layer/content/project/project_models_facade.cpp b/src/core/management_layer/content/project/project_models_facade.cpp
@@ -788,7 +788,8 @@ BusinessLayer::AbstractModel* ProjectModelsFacade::modelFor(Domain::DocumentObje
             for (const auto characterDocument : characterDocuments) {
                 const auto characterItem
                     = d->projectStructureModel->itemForUuid(characterDocument->uuid());
-                if (characterItem->parent()->uuid() != _document->uuid()) {
+                if (characterItem == nullptr
+                    || characterItem->parent()->uuid() != _document->uuid()) {
                     continue;
                 }
 
@@ -823,6 +824,13 @@ BusinessLayer::AbstractModel* ProjectModelsFacade::modelFor(Domain::DocumentObje
                 = DataStorageLayer::StorageFacade::documentStorage()->documents(
                     Domain::DocumentObjectType::Location);
             for (const auto locationDocument : locationDocuments) {
+                const auto locationItem
+                    = d->projectStructureModel->itemForUuid(locationDocument->uuid());
+                if (locationItem == nullptr
+                    || locationItem->parent()->uuid() != _document->uuid()) {
+                    continue;
+                }
+
                 auto locationModel = modelFor(locationDocument);
                 locationsModel->addLocationModel(
                     qobject_cast<BusinessLayer::LocationModel*>(locationModel));