Don't die with LockedException when removing/restoring multiple files…

… from trash

fixes issue #16491

Signed-off-by: Sven Strickroth <email@cs-ware.de>

apps/files_trashbin/lib/Trashbin.php

@@ -968,9 +968,13 @@ private static function getVersionsFromTrash($filename, $timestamp, $user) {
 		[$storage,] = $view->resolvePath('/');
 
 		//force rescan of versions, local storage may not have updated the cache
-		if (!self::$scannedVersions) {
-			$storage->getScanner()->scan('files_trashbin/versions');
-			self::$scannedVersions = true;
+		while (!self::$scannedVersions) {
+			try {
+				$storage->getScanner()->scan('files_trashbin/versions');
+				self::$scannedVersions = true;
+			} catch (LockedException $e) {
+				// potentially a concurrent remove/restore from trash is running
+			}
 		}
 
 		$pattern = \OC::$server->getDatabaseConnection()->escapeLikeParameter(basename($filename));