delay updating setup providers untill we register the mounts

otherwise the fallback to a full setup for a missing cached mount provider will lead to a race condition

Signed-off-by: Robin Appelman <[email protected]>

Author: icewind1991

lib/private/Files/SetupManager.php

@@ -414,7 +414,6 @@ public function setupForPath(string $path, bool $includeChildren = false): void
 
 		$mounts = [];
 		if (!in_array($cachedMount->getMountProvider(), $setupProviders)) {
-			$setupProviders[] = $cachedMount->getMountProvider();
 			$currentProviders[] = $cachedMount->getMountProvider();
 			if ($cachedMount->getMountProvider()) {
 				$mounts = $this->mountProviderCollection->getUserMountsForProviderClasses($user, [$cachedMount->getMountProvider()]);
@@ -429,7 +428,6 @@ public function setupForPath(string $path, bool $includeChildren = false): void
 			$subCachedMounts = $this->userMountCache->getMountsInPath($user, $path);
 			foreach ($subCachedMounts as $cachedMount) {
 				if (!in_array($cachedMount->getMountProvider(), $setupProviders)) {
-					$setupProviders[] = $cachedMount->getMountProvider();
 					$currentProviders[] = $cachedMount->getMountProvider();
 					if ($cachedMount->getMountProvider()) {
 						$mounts = array_merge($mounts, $this->mountProviderCollection->getUserMountsForProviderClasses($user, [$cachedMount->getMountProvider()]));
@@ -442,6 +440,10 @@ public function setupForPath(string $path, bool $includeChildren = false): void
 			}
 		}
 
+		foreach ($currentProviders as $currentProvider) {
+			$setupProviders[] = $currentProvider;
+		}
+
 		if (count($mounts)) {
 			$this->userMountCache->registerMounts($user, $mounts, $currentProviders);
 			$this->setupForUserWith($user, function () use ($mounts) {