From c29357b845b99ecc7b550b6fa8a137b3c6d83d6d Mon Sep 17 00:00:00 2001
From: Marcel van Helmont <marcel@helmont.nl>
Date: Thu, 30 Aug 2018 21:06:29 +0200
Subject: [PATCH] inside ensureWithinStartNode also check if node is trashed
 otherwise go to startnode.

---
 .../common/overlays/mediaPicker/mediapicker.controller.js      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
index 345b9dec5b..1b4c533123 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
@@ -250,7 +250,8 @@ angular.module("umbraco")
                 // make sure that last opened node is on the same path as start node
                 var nodePath = node.path.split(",");
 
-                if (nodePath.indexOf($scope.startNodeId.toString()) !== -1) {
+                // also make sure the node is not trashed
+                if (nodePath.indexOf($scope.startNodeId.toString()) !== -1 && node.trashed === false) {
                     $scope.gotoFolder({ id: $scope.lastOpenedNode, name: "Media", icon: "icon-folder" });
                     return true;
                 } else {